Saqib
57c2e07c45
fix: validate cancellation only if irn generated ( #24608 )
2021-02-18 20:45:27 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Afshan
c44d6b9546
fix: NoneType object has no attribute len() ( #24616 )
2021-02-12 12:24:41 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated ( #24608 )
2021-02-11 17:50:57 +05:30
Saqib
7b2afaf349
fix: NoneType has no len() ( #24600 )
2021-02-10 17:21:12 +05:30
Afshan
53dbe39d12
fix: StopIteration error when e-invoice not enabled ( #24548 )
...
* fix: StopIteration error when e-invoice not enabled
* chore: update message
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-08 12:32:42 +05:30
Saqib
9490122abb
fix(e-invoice): skip e-invoice generation for non-taxable invoices ( #24568 )
2021-02-08 11:40:56 +05:30
Saqib
f29b811a56
fix(e-invoice): do not validate gstin for exports ( #24561 )
2021-02-06 17:55:20 +05:30
Suraj Shetty
055b81da7b
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 15:10:52 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total ( #24497 )
2021-01-29 14:24:08 +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
Nabin Hait
a6213ccd61
Merge branch 'develop' into version-13-beta-pre-release
2021-01-28 17:36:08 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers ( #24200 )
...
* fix: Item valuation for internal stocktransfers
* fix: Consider conversion factor for invoices
* fix: Add missing set warehouse fields
* fix: Add validations and other fixes
* fix: Fixes in flow
* fix: Internal sales item link in Purchase Invoice
* fix: Debugging
* fix: Debug travis
* fix: Remove commented code
* fix: Rate forcing in sales order
* fix: Unreallized profit in Sales Register
* fix: Item wise gst sales register fix
* fix: From warehouse in Purchase Order
* fix: Target field in Sales Invoice
* fix: remove self
* fix: GST Purchasse register and other fixes
* fix: Add shipping_address to no field map
* fix: Ref doc map
* fix: Test Cases
* fix: address mapping between sales and purchase document
* fix: Import Error
* fix: Tax updation for internal invoices
* fix: Purchase Order and Invoice linking
* fix: Internal Party validation fix
* fix: validation
* fix(india): GST Taxes for intra state transfer
* fix(india): GST Taxes for intra state transfer
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 13:09:56 +05:30
Suraj Shetty
0c34a711eb
Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release
2021-01-25 16:06:38 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation ( #24412 )
2021-01-24 10:59:37 +05:30
Suraj Shetty
f0ff23eac3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 19:07:57 +05:30
Saqib
577d2bed6e
fix: failing einvoice test ( #24434 )
2021-01-21 18:43:55 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation ( #24395 )
...
* fix: invalid taxable value of item for e-invoice
* fix: qrcode image duplicate error
* fix: net total discount calculation
* fix: auto fetch auth token
2021-01-20 13:17:42 +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
Anuja Pawar
4569e52b45
fix: fix for not having fiscal year while creating new company ( #24130 )
...
* fix: Fiscal year fix while creating new company
* fix: for failing Travis
* fix: suggested changes
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-14 19:24:30 +05:30
Saqib
53cb9f9f47
fix(e-invoicing): ux issues ( #24358 )
...
* fix: overseas invoice rounding adjustment
* fix: overseas shipping address
* fix: qrcode for document name having forward slash
* feat: sandbox mode toggle
* fix: cannot delete sales invoice if linked to e invoice req log
2021-01-13 21:00:44 +05:30
Anurag Mishra
1e396dcb2a
fix: validated GST state
2021-01-13 14:01:57 +05:30
Rushabh Mehta
7619d3d6d6
fix(merge): develop
2021-01-12 09:16:21 +05:30
Saqib
80e0952ba7
refactor: fetch & validate address from erpnext rather than gst portal
2021-01-05 16:04:25 +05:30
Saqib
a56a5ccefa
refactor: fetch & validate address from erpnext rather than gst portal ( #24297 )
2021-01-05 15:59:17 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes ( #24282 )
2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes ( #24285 )
2021-01-05 13:53:51 +05:30
Saqib
f8f015c961
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:28:08 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:26:05 +05:30
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation ( #24253 )
2020-12-31 11:35:46 +05:30
Karthikeyan S
a25cb9a563
fix(GST E Invoice): update live URLs for adaequare GSP ( #24251 )
2020-12-30 19:41:00 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP ( #24248 )
2020-12-30 19:22:37 +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
Saqib
17e96901db
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 20:55:21 +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
493eea19e8
feat: added link from desk page and some minor fixes
2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d
test: gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
e1464a7bf0
feat: Indian Standard Gratuity Rule
2020-12-23 18:07:06 +05:30
Deepesh Garg
e77e3aa36d
fix: Typo in tax category doctype query
2020-12-17 18:49:58 +05:30
Deepesh Garg
b074334dcf
fix: Typo in tax category doctype query
2020-12-17 18:46:59 +05:30
Deepesh Garg
a9db5a200f
Merge pull request #24160 from deepeshgarg007/tax_template_update_customer_v13
...
fix: Tax template update on customer address change
2020-12-16 21:51:01 +05:30
Deepesh Garg
ad59726f20
fix: Tax template update on customer address change
2020-12-16 20:51:59 +05:30
Your Name
3ebe511eb9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-16 08:19:47 +00:00
Deepesh Garg
96a5e4effa
fix: Tax template update on customer address change
2020-12-16 13:00:55 +05:30
Rushabh Mehta
34fc528500
fix(minor): debounce taxes call
2020-12-16 09:44:11 +05:30
Nabin Hait
3423d94145
fix: Fixed merge conflict
2020-12-12 21:12:56 +05:30
Deepesh Garg
a767085276
fix: Tax template update on supplier
2020-12-04 18:07:46 +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
06e16eb748
Merge pull request #23941 from pateljannat/place-of-supply-change-issue
...
fix: place of supply change on address change
2020-11-20 11:13:19 +05:30
pateljannat
1d5d863e9a
fix: removing return_taxes condition
2020-11-19 20:11:45 +05:30
pateljannat
cd05b34691
fix: company filter added again
2020-11-19 11:37:08 +05:30
Smit Vora
bbe4933a52
fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ
2020-11-18 21:00:09 +05:30
pateljannat
410db04b48
fix: linter issue for translation syntax
2020-11-18 15:57:16 +05:30
pateljannat
d0c528143f
Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue
2020-11-18 12:52:24 +05:30
pateljannat
8c9b60edfe
fix: reversing previous commits and adding condition in regional controller
2020-11-18 12:51:13 +05:30
Jannat Patel
96a0c17626
Merge branch 'develop' into place-of-supply-change-issue
2020-11-18 10:27:20 +05:30
pateljannat
6b10d87d46
fix: place of supply change on address change
2020-11-17 20:34:51 +05:30
pateljannat
642819b955
fix: place of supply change when address changes
2020-11-17 09:47:10 +05:30
Deepesh Garg
29a8994506
Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch
...
fix: Auto Statewise gst tax template
2020-11-08 17:48:57 +05:30
Saurabh
7c06c28216
fix: merge-conflicts
2020-11-06 19:08:58 +05:30
Deepesh Garg
59ccb64e18
fix: Auto Statewise gst tax template
2020-11-05 16:29:34 +05:30
Deepesh Garg
eacfd792e6
fix: fieldname
2020-10-30 22:12:24 +05:30
Deepesh Garg
db3fa4e6b2
fix: Place of Supply fix in Sales Invoices
2020-10-30 19:19:48 +05:30
Anurag Mishra
54cd194b41
feat: removed roles for some reginal report and added via setup
2020-09-03 13:52:40 +05:30
Deepesh Garg
cebf803455
fix: Update tax template on supplier address change
2020-09-01 16:15:28 +05:30
Deepesh Garg
c3fb68265f
fix: Do not update total for RCM invvoices if net taxes are zero
2020-08-25 13:35:33 +05:30
Deepesh Garg
afd2dd3570
fix: Unable to submit reverse charge invoice
2020-08-20 16:52:52 +05:30
Deepesh Garg
8aed48fe31
fix: Do not update total for RCM invvoices if net taxes are zero
2020-08-19 18:59:27 +05:30
Deepesh Garg
1c14606c06
fix: Total calculations for multicurrency RCM invoices ( #23072 )
2020-08-18 19:32:52 +05:30
Deepesh Garg
21a220e2a5
fix: Update state code and union territory for Daman and Diu ( #22988 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-12 19:19:03 +05:30
Marica
0c818927a5
fix: get_regional_address_details missing positional arg 'company' ( #22915 )
2020-08-05 16:47:41 +05:30
Deepesh Garg
188273564c
fix: Multiple fixes in GST
2020-07-17 11:31:15 +05:30
Deepesh Garg
52c319cfa7
fix: Update RCM only for indian countries
2020-07-16 00:23:58 +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
Sagar Vora
c9b4ba6de8
fix: ewaybill json had json dump of json dump, and other related fixes
2020-07-11 21:29:17 +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
Anurag Mishra
289c82243f
feat: New Payroll module ( #21990 )
...
* feat: Moved Document to Payroll Module
* feat: Moved Reports to Payroll Module
* feat: Moved Print fromat With Patch
* feat: Moved Notifiction to Payroll Module and patches
* feat: added dashboard and desk page to Payroll
* feat: Payroll Dashboard
* feat: Module onboarding
* feat: Income tax Deductions Report
* feat: Ecs Checklist Report
* feat: Provident Fund Report
* feat: Professional Fund report and commonified Code
* feat: Total Payments Based On Payment Mode Report
* fix: refactor and added chart Total Payments Based On Payment Mode
* feat: Payroll Settings
* fix: Bank remittance Report
* feat(Payroll based on): Considered unmarked days
* feat: Added Help for condition an formula in Salary structure
* fix: requested changes
* fix: rename report Ecs checklist to salary_payments_via_ecs
* fix: renamed report report/total_payments_based_on_payment_mode
* fix: added role via setup.py for regional report
* feat: added All reports to desk page
* fix: frappe.reload doc in all patches
* fix: codacy
* fix: frappe.reload_doctype for patches
* patch: is_income_tax_component and component_type for salary component
* fix: uncommented code
* test: fixture
* fix: test
* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
Deepesh Garg
24f9a80e7d
fix(India): Reverse charge mechanism for GST
2020-06-03 10:59:37 +05:30
karthikeyan5
ca46bedfcb
fix(ewb): remove checksum validation for TRANSIN
2020-05-30 15:00:56 +05:30
Nabin Hait
10df3d5081
fix: Get basic and hra component from db, not from cache
2020-05-14 17:15:36 +05:30
Anurag Mishra
33793d4e0d
fix: Permission issue Employee Tax exemption ( #21490 )
2020-04-29 11:48:41 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
...
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53
fix: Test
2020-04-27 14:05:45 +05:30
Deepesh Garg
00ea59b447
fix: Utils messsage cleanup
2020-04-27 10:50:40 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level ( #20870 )
...
* feat: Allow tax withholding category selection at invoice level
* fix: Linitng fixes
* feat: TDS calculation using common PAN
* fix: Add provision to deduct Lower TDS in purchase invoice
* fix: Consider only ref docs company while computing TDS
* fix: Default permission fixes
* fix: Add validation for dates in fiscal year
* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab ( #21399 )
...
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Marica
9942acd9d4
fix [ux]: Material Request Form Cleanup and UX ( #20810 )
...
* fix (ux): Material Request Form Cleanup
* fix: Get Items from popup UX
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:13:39 +05:30
Shivam Mishra
d9ce5843e5
chore: resolve conflicts
2020-04-13 13:43:04 +05:30
Raffael Meyer
9aae0c27c2
feat(regional): a central place for regional address templates ( #19862 )
...
* feat: a central place for regional address templates
* set up address templates during install
* why don't the tests run?
* fix: remove unused variables, fix cwd
* fix: .get() dicts contents
* fix: choose the right default
* fix: fieldname is template, not html
* fix: import unittest
* fix: remove unnecessary code
* fix: ensure country exists
* fix: ensure country exists
* feat: test updating an existing template
* fix(regional): DuplicateEntryError in test_update_address_template
* refactor and set 'is_default'
* fix codacy
* fix: patch gst_fixes
* fix: patch update_address_template_for_india
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 08:56:57 +05:30
Deepesh Garg
6c8efdef09
fix: User permissions in GSTR 3B report
2020-04-04 20:05:17 +05:30
Shivam Mishra
1d6395c5cf
feat: add PAN details field to member for India
2020-03-30 18:14:44 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
Saqib
5e6ce88c78
fix: gst permission for gst settings & hsn code ( #20500 )
...
* fix: gst permission for gst settings & hsn code
* Fix: typo
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-03 15:40:35 +05:30
Deepesh Garg
cce3ac9f79
fix: Move E-Way bill button under create
2020-02-02 21:25:58 +05:30
Suraj Shetty
da2c69e836
fix(translations): Incorrect syntax
2020-01-29 15:34:06 +05:30
deepeshgarg007
c58dc873d5
fix: Get regional address details fix
2019-12-12 14:55:57 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* feat(regional): Auto state wise taxation for GST India
* fix: Update gst category on addition of GSTIN
* fix: Codacy and travis fixes
* fix: Travis
* fix(test): Update GST category only if GSTIN field available
* fix: Test Cases
* fix: Do not skip accounts if place of supply is not present
* fix: Auto GST taxation for SEZ Party types
* fix: Automatic taxation for multi state
* fix: Codacy and travis fixes
* fix: Auto GST template selection in Sales Order
* fix: Move inter state check and source state to tax category
* fix: Remove unique check from tax template
* fix: Remove unique check from tax template
* fix: Address fetching logic in Sales
* fix: fecth tax template on company address change
* fix: fetch company gstin on address change
* fix: company_gstin set value fix
* fix: Mutiple fixes and code refactor
* fix: Add missing semicolon
* fix: Company address fetching in sales invoice
* fix: Remove print statement
* fix: Import functools
* fix: Naming fixes and code cleanup
* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
deepeshgarg007
62fbf37eb4
fix: GSTIN validation msg fix
2019-11-07 21:54:25 +05:30
Kenneth Sequeira
a54b7542f1
fix: sales invoice labels ( #19267 )
2019-10-10 18:50:39 +05:30
Mangesh-Khairnar
d94a389dd3
chore: remove unwanted code ( #18645 )
2019-08-23 16:31:09 +05:30
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Anurag Mishra
a5527225b6
fix: requested changes
2019-06-14 15:26:19 +05:30
Deepesh Garg
459155fae1
fix: GST Validation for UIN and OIDAR ( #17866 )
...
* fix: GST Validation for UIN and OIDAR
* fix: Define GST category
* fix: Get gst category only for Customer and Supplier
* fix: GST validation
* fix: GST validation fixes
2019-06-14 12:01:34 +05:30
Prasann Shah
829172c267
[Add] GSTIN filters in hsn wise summary and itemised reports
2019-06-06 12:08:09 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report ( #17524 )
...
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Mangesh-Khairnar
6e3586423f
fix: multiple changes
2019-05-15 15:50:50 +05:30
Mangesh-Khairnar
6175eb2cf9
feat: add validation for fields
2019-05-14 18:25:57 +05:30
Faris Ansari
ec7b064528
fix: Clear messages during setup fixtures
2019-05-14 16:21:09 +05:30
Mangesh-Khairnar
4df61b1495
fix: join multiple emails
2019-05-11 20:10:20 +05:30
Mangesh-Khairnar
0b2fc4fbc1
fix: multiple changes
2019-05-08 15:57:29 +05:30
Mangesh-Khairnar
27ea171187
style: change formatting
2019-05-06 16:37:34 +05:30
Mangesh-Khairnar
66a3c99800
feat: fetch custom fields for remittance creation
2019-05-06 16:26:05 +05:30
Mangesh-Khairnar
9215de02c5
feat: add india specific custom fields in company
2019-05-06 16:24:10 +05:30
Mangesh-Khairnar
c448664e6b
feat: generate file name
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8
feat: add advice row
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
b89db7f5a8
feat: add logic to generate txt file
2019-05-05 22:37:21 +05:30
Nabin Hait
89b06132cd
minor fix
2019-05-01 14:20:08 +05:30
Nabin Hait
10dae5d3c3
fix: Set GST Category fieldtype as Select in invoice
2019-05-01 14:18:37 +05:30
Nabin Hait
49446ba760
fix: test cases
2019-04-25 19:54:49 +05:30
Nabin Hait
04e7bf464f
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
Himanshu
c930cb10fa
fix: remove duplicate doctype
2019-04-04 11:01:10 +05:30
Himanshu Warekar
656d8e4557
fix(India): HSN Code
2019-04-01 19:38:43 +05:30
Himanshu Warekar
624477cb21
fix(India): Add HSN/SAC in setup
2019-04-01 19:25:28 +05:30
Nabin Hait
f4af608408
fix: Fetch HSN code only if empty
2019-04-01 11:51:54 +05:30
Zarrar
963d62b701
feat: Chart of Accounts Importer ( #16623 )
...
* bare doctype created for COA utility
* improvise doctype's design
* validation to check no transaction exist for the company
* download file and import coa - client side logic added
* download csv template to create custom chart
* read the custom csv uploaded and parse it to appropriate format
* convert list of list to nested tree structure
* preview the uploaded chart before actual import
* toggle field based on necessity
* tweak create_charts and build_json logic to incorporate COA Import utility
* code cleanify and validation call added
* code enhancement for flexibility and validation added
* show import button only if data is validated
* unset existing data and load new accounts
* disable coa fields if parent_company set, minor improv
* file api fix
* added progress bar
* codacy fixes
* fix: Add account number in template
* fix: TDS account exception handling fix
2019-03-23 10:30:12 +05:30
Deepesh Garg
22b61607c6
feat: GSTR3B Report JSON creation and Print Format ( #16595 )
...
* feat: Created doctype for GSTR3B report and added boilerplate code
* feat: Updated gst_fields and patches for gst_category
* feat: Functions for calculating itc amount
* fix: Patched eligibility_for_itc_field
* fix: Updated set_category for gst
* fix: Function for setting iter_state supplies
* fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format
* fix(style): Added missing semicolon and removed unused imports
* fix: Patch field only if column is available
* fix: Make custom fields only for india sepecific company
* fix: Add intro to gstr3b report
* fix: Updated patch in patches.txt
* fix: Update patches.txt
* fix: Update patch to set GST Category
* fix: Add fields for nil rated and non gst in item master
* fix: Added logic for nil rated and non gst inward flow
* fix: Initial test case for GSTR3B Report
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Add link for gstr_3b_report in accounting module
* fix: Updated report template
* fix: Changes in GSTR3B Report doctype
* fix: Added function to get missing field invoices
* fix: Added more test cases
* fix: Item not found error in test case
* fix: Key error in state numbers
* fix: Changes in GSTR3b Doctype
* fix: Changed functions to method
* fix: Minor fix in patch
* fix: Add gst_ctegory in GST Reports
* fix: Minor fixes in patch and itc_mapping
* fix: Query to patch itc field
* fix: Patch registered customers and fix for multiple gst accounts
* fix: Test case
* fix: Total taxable calculation logic fix and template enhancement
* fix: Calculate txval seperately
* fix: itc amount calculation fix and patch improvement
* fix: Updated test_cases for itc calculation
* fix: Missing field query
* fix: Multiple minor fixes inreport
* fix: Added transalations in GSTR3B-Form
* fix: Use double underscore for translation
* fix: GST fields ordering fix
* fix: Print form precision fix and get_period function fix
2019-03-21 20:47:47 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
rushin29
08a209bc52
fix: gst_state_number for address with Unregistered GST ( #16798 )
2019-03-15 15:28:50 +05:30
Frappe Bot
74fd5daeb2
Merge branch 'master' into develop
2019-02-15 10:22:33 +00:00
Nabin Hait
afef9c1cc7
fix: Ignore tds account while creating tax withholding category
2019-02-12 11:28:20 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +05:30
Nabin Hait
1467962f8a
Merge pull request #16490 from nabinhait/gst_settings_perm
...
GST Settings permission and regional taxes creation
2019-01-29 11:27:18 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode
2019-01-29 11:13:04 +05:30
Nabin Hait
49b41e49ae
fix: Added permissions in GST Settings and added filters for accounts based on company
2019-01-24 17:55:44 +05:30
Sagar Vora
d75095b04c
fix(regional): remove duplicate validation for GSTIN
2019-01-23 14:40:01 +05:30
Frappe Bot
34121bc81a
Merge branch 'master' into staging-fixes
2019-01-23 08:08:55 +00:00
FinByz Tech Pvt. Ltd
237a871f17
fix: NoneType object has no attribute "gstin" ( #16458 )
...
* fix: NoneType object has no attribute "gstin"
* fix: handle NoneType values
2019-01-22 20:49:06 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Nabin Hait
4fd710a392
Merge branch 'staging-fixes' into company_address
2019-01-16 17:51:49 +05:30
Nabin Hait
3dd5f55412
feat(stock-reco): Fetch items in stock reco based on group warehouse
2019-01-16 16:20:05 +05:30
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address
2019-01-16 11:17:55 +05:30
Saurabh
7d630b3e29
Merge branch 'master' into staging-fixes
2019-01-15 19:41:09 +05:30
Sagar Vora
f99e013ebc
fix: gstin validation should work when there is no state ( #16378 )
2019-01-10 11:57:24 +05:30
Sagar Vora
07cf4e8f5b
fix: use division consistent with Python 3 & other changes
2019-01-10 11:14:58 +05:30
karthikeyan5
2825b929c1
fix(GSTIN Validation - india): added checksum validation for GSTIN
2019-01-09 19:15:10 +05:30
deepeshgarg007
d29ee97307
Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt
2019-01-09 17:09:11 +05:30
Sagar Vora
d40743a570
fix: 14th digit may not be zero
2019-01-07 13:38:43 +05:30
Himanshu
75ab042632
removed lowercase regex
2019-01-04 17:13:43 +05:30
Himanshu
547229fef1
PAN card validation in GST
2019-01-03 23:20:38 +05:30
Himanshu
53c040f838
Gst number validation fix
2019-01-03 12:50:18 +05:30
Prateeksha Singh
dabf349599
[setup] don't premake company fixtures
2018-12-12 21:29:54 +05:30
Prateeksha Singh
39b8765961
[setup][init] setup as document records
2018-12-12 21:29:54 +05:30
Nabin Hait
f77cd54a6c
fix(tds): Create tds payable under correct parent
2018-11-26 11:05:28 +05:30
Nabin Hait
d34bfa8c2c
fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes
2018-11-13 18:21:22 +05:30
rohitwaghchaure
b1241caf48
Merge pull request #15650 from rohitwaghchaure/fix_gst_state_issue
...
[Fix] Nontype object has no attribute gst_state
2018-10-11 10:53:46 +05:30
Rohit Waghchaure
b6a735e021
[Fix] Nontype object has no attribute gst_state
2018-10-11 10:40:34 +05:30
Sagar Vora
d92f3ac480
Fix 'transporter info' section in Delivery Note ( #15565 )
...
- create is_transporter checkbox in supplier doctype
- new field transporter (supplier with is_transporter checked)
- created fields driver and driver_name
- removed GST India fields from core doctype
- removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery)
- read_only transporter_name field (kept for backwards compatibility)
- made necessary changes in delivery_trip implementation
- hidden section's fields from print (preserving v10 convention)
- added transporter field to 'Driver' doctype
- added queries for transporter and driver fields
- GST India fields in regional module
- Fix e-waybill report
2018-10-10 14:51:26 +05:30
Nabin Hait
562d942a7d
fix(patch): gst state number in address where number is less than 10
2018-09-07 16:14:44 +05:30
Nabin Hait
2390da647f
GSTR-1 minor fixes
2018-08-30 16:16:48 +05:30
rohitwaghchaure
8cca61f1ba
[Fix] Removed roles for Eway bill report ( #15157 )
2018-08-20 17:53:56 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
Zarrar
7f8024c516
[Enhancement] Tax Withholding Category ( #15064 )
...
* add single, cumulative threshold, remove checkboxes
* remove tds child table from supplier & add tds link field
* add description field in tax withholding category
* add tax withholding data for indian setup, some fixes
* add a checkbox for tax withholding in purchase invoice
* remove supplier's child table for tds
* enable tds field if supplier has tds set inits master
* move rates data to child table - adding fiscal year support
* change bootstrap data according to child table config of tds
* show category name in list view
* loyalty program fixes
* moved tax calculation to tax_withholding.py
- calculation for tds amount for cumulative threshold from gl entry
* add fiscal year dependency in company test
* minor loyalty program fix
* minor tier calculation fix
* minor handling duplicate exception
* toggle apply_tds according to supplier, code rectify
* minor fixes for loyalty program
* test case for single and cumulative threshold
* codacy fix
2018-08-01 17:45:05 +05:30
Ranjith Kurungadam
e51c175aca
Fix tests ( #14991 )
...
* minor improv in fetching account
* pass name field while creating tds doc
* create tds fixture after creating tds account
* Inpatient Record - Test - Fix
* fix batch query
2018-07-24 11:07:28 +05:30
Nabin Hait
4037915b3c
Update setup.py
2018-07-23 18:05:55 +05:30
Faris Ansari
b23d15fba9
Fix typo
2018-07-20 18:16:31 +05:30
Rushabh Mehta
69fa808def
[minor] fixes + patch ( #14937 )
2018-07-17 18:22:51 +05:30
Ranjith Kurungadam
14e94f824e
fix - HRA India ( #14911 )
2018-07-16 16:12:46 +05:30
Ranjith Kurungadam
b1a756cc9f
HRA Indian regional - field basic in company, calc changes ( #14757 )
2018-07-01 16:42:38 +05:30
Ranjith Kurungadam
4f9744a56d
HRA fix ( #14589 )
...
* hra - fix var ref before assignment
* Tax Exemption Category - remove deduction component
2018-06-20 11:10:56 +05:30
Shreya Shah
97124e92fa
[Fixes] Tax withholding category and Bank Guarantee ( #14576 )
...
* Fetch withheld percentage
* Set query for accounts on the basis of company
* Fix bank guarantee error on submit
* Remove errors caused by fields which are removed
2018-06-19 10:46:41 +05:30
Ranjith Kurungadam
a8e047afc8
HRA tax exemption Indian regional ( #14520 )
...
* remove HRA fields fom declaration, proof submission
* HRA fields, methods India regional
* Company - remove Payroll Settings
* HRA India regional, override methods
* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
rohitwaghchaure
2704bef0b3
Merge pull request #14368 from shreyashah115/fix-trav
...
Some more travis fixes
2018-06-07 14:14:33 +05:30
Rohit Waghchaure
de82ad1c5f
[Fix] Clenaup code if supplier gstin is none
2018-06-07 13:24:25 +05:30
Shreya
2ad81726d5
Fix utils.py
2018-06-06 02:09:17 +05:30
Shreya Shah
4fa600a8dd
Apply GST based on Origin and Place of supply GST Code ( #14288 )
...
* Add new gst field in Taxes and Charges template - is_inter_state
* Add a patch
* Add a regional function to fetch taxes on the basis of GSTin
* Add regional function to hooks.py
* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN
* Fixes in the setup.py for India region
* Set is_inter_state field
For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.
* Fix as per review comment
2018-06-05 11:27:53 +05:30
Saurabh
b9d3385fec
calculate TDS on Sales Invoice Amount
2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f
Bootstrap 'TDS' via fixture
2018-05-14 20:41:38 +05:30
Rushabh Mehta
369afce43c
[patch] ignore validations while creating custom fields for gst via patch
2018-04-26 10:10:03 +05:30
Nabin Hait
642d39098a
Fixed merge conflict
2018-04-13 14:38:57 +05:30
rohitwaghchaure
2c111b7b14
Minor fix ( #13600 )
2018-04-11 02:20:06 -08:00
Manas Solanki
b2f9af71d2
Update setup.py
2018-04-05 21:35:29 +05:30
Pawan Mehta
f41963536e
Group email fields together and add IFSC Code ( #13535 )
...
* [fix] #13534
* change field order cell no
2018-04-05 14:54:51 +05:30
Vishal Dhayagude
2505c74d64
Place of Supply set on save Delivery Note if Customer Address Present ( #13492 )
2018-04-04 11:05:21 +05:30
Nabin Hait
b95ecd7fcd
Gstr reports ( #12940 )
...
* GSTR1 for B2B (#12296 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 )
* [minor] Modified GSTR1 report to identify missing GST Account in GST Settings
* Update gstr_1.py
* GSTR1 for B2B, B2CL and B2CS (#12459 )
* [Report] GSTR - 1 CDNR Report (#12554 )
* [wip] cdnr
* [WIP] cdnr with optional data
* [wip] Export GSTR-1
* [minor] Minor changes in export
* [new] Custom field added for GST
* [fix] Minor changes in GSTR1 Report
* [minor] Minor changes in gstr1
* [fix] Codacy Fixed
* Update setup.py
* [wip] Gstr2
* [fix] Fetch correct Tax Details
* [minor] ITC data append to row
* [fix] CDNR negative value
* Cleanup and fixes on GSTR-2
* Minor fixes in gstr reports (#12848 )
* [new] B2C limit fetch from GST Settings (#12905 )
* [new] b2c limit fetch from gst setting
* [fix] Patch Added for b2c limit
* Update gstr_1.py
* Update utils.py
* Cusotm fields related GSTR2
* minor fixes
* minor fixes
* some more fixes
* Added duplicate patch and some tests as not required on develop
2018-02-16 13:19:04 +05:30
rohitwaghchaure
e3b5c0f727
[fix] Regional print format showing for other countries users ( #12045 )
2017-12-16 10:53:53 +05:30
Nabin Hait
35cd1d325f
[fix] Set GST State code based on state, even if GSTIN not mentioned ( #11755 )
2017-11-28 13:01:01 +05:30
Nabin Hait
bdb4c542e7
default permission from GST doctypes
2017-09-29 10:39:32 +05:30
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
rohitwaghchaure
16645803f9
[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports ( #10872 )
2017-09-28 11:05:03 +05:30
Rushabh Mehta
f702d72c35
[minor] [performance] push hsn code creation after setup ( #10928 )
2017-09-27 15:31:30 +05:30
Rushabh Mehta
f056974bc5
[domain] Healthcare ( #10664 )
...
* Medical module for erpnext
* Changes in core for Medical module
* patient registration updated
* fix - appointment invioce - fields missing
* pages- indicator instead of bg-color
* Lab Test field renamed service type
* Department added Lab Test
* procedure name in prescription
* fixes sample collection
* filter disabled patient
* fix patient admission
* updated patient age
* availability check msg updated
* fixes, removed procedure from invoice
* sample print renamed
* fixes, validation
* service desk physician in filter
* refactor scheduler
* Appointment -field property - set only once = 1
* Appointment - Mark closed and pending buttons removed
* Appointment - readonly = 1 if value set
* Appointment - availabilty
* Appointment - Cancel - info - cancel invoice
* Appointment - set pending appointments
* Dosage form - new DT
* Drug Prescription - Dosage form added
* Facility - Floor - removed from Fecility
* Floor - removed
* Lab Test Template - item creation validation
* Procedure - Create Procedure
* Procedure Appointment - new DT
* Service Unit - Floor reference removed
* Zone Fcilities - Unused DT removed
* Appointment Desk - fixed
* Service Desk - method pointing from procedure changed to procedure_appointment
* Consultation print - got featured
* Consultation - removed patient refernce to procedure prescription
* Procedure Prescription - removed patient refernce
* Lab Test - Changed field properties and value
* Lab Test - field property changed
* Lab Test - methods rewrite - lab test doc creation
* Lab Test - create lab test from invoice and consultaion - got changed
* Button History changed to Medical Record
* Service Desk - Updated
* Notification - Procedure Appointment
* fix-get procedure prescription
* fix field added to test prescription
* msgprint on invoice creation
* fix data on install
* Merge branch erpnext/develop
* fixes- minor
* Setup wizard - Create Sensitivity
* Appointment - Validate and Save if there is no schedule for Physician
* Consultation - Button create vital signs and medical record
* Review Type - New DocType
* Review Detail and Treatment Plan - Childs - Consultation
* Patient Medical Record - field Attach doc
* Consultation - New Fields
* Consultation - Manage new Fields - Medical record add action
* Patient Relation - Child DocType - Patient
* Patient - Patient Relation added
* Patient - collapsible = 1
* Laboratory Settings - fields - message for lab test
* Laboratory Settings - get message for lab test
* SMS text for lab test and invoice test report
* Procedure Stock Detail - Stock detail for Procedure and Template
* Template Stage Detail - Stage detail for Procedure Template
* Procedure Stage Detail - Stage detail for Procedure
* Service Unit - field - warehouse
* Scheduler - msg - content changed
* Laboratory Settings - defualt - msg content
* Invoice Test Report - msg print
* Print Format-Changed-Consultation-Invoice Test Report-Lab Test
* OP Settings - Expnse Account for Stock Entry in Procedure
* Procedure and Procedure Template - Manage Stock Stage and Sample Collection
* Procedure Appointment - Manage Stock and Stage
* Lab Test - fixed - resource not find
* Invoice Test Report - fixed - resource not find
* Procedure - doc reload after insert
* Patient Medical Record - fixed - refernce missed
* Create Vital Signs -on client side
* Rename module Medical to Healthcare
* Remove In Patient (IP) Feature.
* Rename - Procedure to Clinical Procedure
* Remove spaces in Naming Series
* Rename Duration to Drug Prescription Duration
* Duration to Drug Prescription Duration
* Merge All Settings to Healthcare Settings
* Healthcare settings - import fixed
* Procedure related documents are removed
* Appointment Desk and Sevrvice Desk are removed
* Consultation - minimal
* Consultation - minimal
* Consultation - minimal - patient detials in collapsible section
* Message Print to Alerts
* Patient - some fields removed
* Patient - create consultation - message print to alerts
* Consultation - show patient details updated
* Setup wizard - Duration to Drug Prescritpion Duration
* Healthcare Settings - patient registration - fee collection
* Lab Test - Create Sales Invoice bug fixed
* Healthcare menu rearranged
* Healthcare Settings - Optimised and Rearragnged
* Healthcare Settings - Expense account removed
* Receivable account removed from patient
* Patient - Optimised and Rearragnged
* Removed Referring Physician
* Healthcare Settings - bold headings removed
* Physician - Patient - Fields are Segregated
* Remove Service Unit
* Remove - Service Type
* Consultation invoice
* Lab Test - invoice
* Patient - Invoice
* Rename Appointment to Patient Appointment
* wip
* Patient Dashboard, Physician Form cleanup
* Dosage renamed to Prescription Dosage
* Renamed Drug Prescription Duration to Prescription Duration
* Patient Appointment booking modal
* Patient Age - calculate by dob
* Remove - scheduler
* Consultation - Appointment to Patient Appointment
* Patient Dashboard - rearranged
* Patient Appointment
* Removed rer_physician from lab test and consultation
* Patient Appontment Changes
* Appointment and Consultation - optimized
* Patient Appointment - fee validity code optimized
* Consultation and Patient Appointment - Invoice validate two side
* fix : #13 remove relation to admission
* Healthcare - Patient Portal
* fix import error
* domain Healthcare added on install
* Removed - Invoice Test Report
* Physician Schedule - menu
* Consultation - patient details - re write
* New Doctype-Medical Code
* Consultation - Daignosis codification
* Medical Code - Codification - Settings
* Medical Code Standard - Medical Code - Codification - Settings
* fix appointment calendar
* fix appointment analytics
* Menu Medical Code Standard
* New Doctype - Medical Code Standard
* Set Physician Role insted of IP Physician and OP Physician Role
* fixed some json files
* Medical code - permission to physician
* Unused Childs - Work Schedule and User List - Removed
* Label Procedure to Lab Test
* Lab Test and Patient - code optimised
* Add Item Groups - setup wizard
* Healthcare Settings - add Role - Medical Administrator
* Healthcare - Demo setup - Make Demo
* Fee Validity - Logic Test
* Test Fee Validity - Optimised
* Healthcare Doctypes - Restricted to Domain Healthcare
* Domainify - remove Healthcare Roles - Other Domains
* Healthcare doctypes - beta checked
* Codacy fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Codacy - fixes
* Lab Test - print hide =1 for some fields
* Consultation - Codification field label to Medical Coding
* Codacy fixes - import frappe and etc.
* Codacy fixes - import frappe in test_vital_signs
* Codacy fixes
* Codacy fixes
* Codacy fixes and remove delete perm for patient
* send_sms - import form frappe
* Healthcare Settings
* Lab Prescription - Consultation - Test Code - read_only = 0
* Portal fixes
* Patient Appointment - filter physician - if has schedule
* Physician - IP Charge - Removed
* test - files
* Web Form - Patient Profile - removed
* Role Medical Administrator to Healthcare Administrator
* WIP healthcare documentation
* Coday - fixes
* Travis - fixes
* Lab Test Report - menu
* Reorder Healthcare settings - group lab config to bottom
* Sample Collection - New - allow Sample and patient Selection
* Rate - similar behaviour and Label as in Item Standard Selling Rate
* Healthcare documentation
* Lab Test Samples to Lab Test sample
* Commplaints to Complaint
* Commplaints to Complaint
* Antibiotics to Antibiotic
* Appointment Token Number - remove
* View - Medical record
* Codacy fixes
* update healthcare docs
* Cleanup Docs - Search, quick entry, trsck change, etc.
* [minor] ux changes
2017-09-13 12:52:30 +05:30
Nabin Hait
f8f29677fd
Merge branch 'master' into develop
2017-09-12 16:16:57 +05:30
Nabin Hait
e5716e3b1e
Default view of BOM is Listview
2017-09-11 19:21:47 +05:30
Nabin Hait
cfb9310d13
Removed commit after creating custom gst fields
2017-09-11 15:00:16 +05:30
