* 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
* feat: Added check for encrypting salary slips and password policy field
* feat: make password policy mandatory if encrypt option is selected
* feat: added password logic to email_salary_slip
* fix: import error
* chore: Minor enhancement to validations in salary slip
* fix: travis patch
* feat: Modified email body for password protected salary slips
* 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
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
fixes:
removed cleanup_files from italy/utils
removed extract_doc_number from italy/utils
added country filter to italian localization patch
replaced dict assignment with dot operator in prepare_invoice
correcions in e-invoice xml following changes in prepare_invoice
added setup_report in patch
added section for e-invoicing custom fields in company
added Italy in test_company
* qms color fix according to palette
* changed qms icon and color
* patch to change icon
* fix no module named v12_0
* removed spacing in desktop icon
* fix: line break
* renamed QM to Quality
* patch to rename quality management to quality
* resolve merge conflicts
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops
* feat(delivery_trip_status): Fix tests
* feat(delivery_trip_status): Fix allow on submit for status
* feat(delivery_trip_status): Change status mapping
* feat(delivery_trip_status): Fix patch
* Update update_delivery_trip_status.py
* Sales Analytics Report
* Codacy issue fixes and name column addition
* Minor Fixes
* Minor Changes
* Codacy Issue Fixes
* Codacy Issue Fixes
* Bug Fixes
* Code cleaning and optimization
* Deleted Duplicate code
* Indentation Issue Fixes
* Added Supplier Condition
* Cleaned code and better function naming
* Added report link for sales analytics in selling.py
* fix(patch): Patch to delete old analytics reports
* feat(refactor): Created class and refactored code using object oriented paradigm
* Column condition fix
* Minor condition fix
* Minor fix
* parent child map for purchase analytics
* Minor Fixes in get_periodic_data
* Used dots for filters instead of brackets
* Minor Bug fix in get_period_date_ranges
* Test Cases for Analytics Report
- 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
* Lead to customer UX enhancement
* Market segment
* Market Segment to DocType
* Specific function for fixtures
* Merge issue correction
* Doctype merge correction
* fix(desktop_icon): remove land unit icon if exists
Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if
exists, since 'Land Unit' has been merged with 'Location'
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
* Update remove_land_unit_icon.py
* [Enhance] Added job card against the work order
* removed work order from timesheet
* Fixed codacy
* Added patch to make job card from the timesheet
* Timer in job card
* Dates validation in job card
* Added button to make job card from work order
* Added sub-assembly operation in the work order
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
* Add discount_amount and base_discount_amount in Sales Invoice Item
* Add patch for existing documents
* Discount amount field in all child tables of Purchase and Selling
* Remove console statements
* Add Defaults table in Item Group
* Fetch defaults from Item group if not found in Item
* Add patch
* Remove default fields from Item Group
* Set query for defaults
* Fix Codacy
* Modify test records
* Modify budget.py and sales_order.py
* Remove join from query
* Else condition to avoid error if no defaults found
* refrain from making item test records before item_group
* default cost center fetch correction
* Remove tab item group from query
* Add patch to skip user perm check for doctype
Skip user permission check for doctypes where
department link field was recently added
* Remove new doctype entries
* Skip doctypes if department field already exists (custom field)
* Add patch to set department value based on employee
* Update set_department_for_doctypes.py
* Update skip_user_permission_check_for_department.py
* Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot
* Role name change
* Rename DT - Physician Schedule to Practitioner Schedule
* Rename DT - Physician Service Unit Schedule
* Rename DT - Physician to Practitioner
* Lab Test Template - field disabled in standard filter
* Patient - customer creation fix
* Rename DT - Consultation - Encounter
* Patches.txt updated for rename doctypes and fields in Healthcare
* Patch - Rename doctypes and fields in Healthcare Domain
* Fix - Patch - rename_healthcare_doctype_and_fields
* Vital Signs - New Fields - Abdomen, Tongue and Reflexes
* Web Form - Patient - Personal Details
* Rename DocType Physician to Healthcare Practitioner
* Rename DocType Consultation to Patient Encounter
* Web Form - Personal Details - Fix
* Web Form - Personal Details - Codacy Fix
* Healthcare patch run for all domain
* Rename label Practitioner to Healthcare Practitioner
* Rename Encounter to Patient Encounter
* Merge Land Unit with the Location doctype
* Fix patch
* [minor] modification to Location structure
- Create a group node "All Land Units" and place all the land units
under it
- Remove "Linked Analysis" from location
* increase precision for conversion value
* inverse the conversion data
* update uom data
* rectify conversion logic according to inversion of values
* rectify test case for uom conversion
* patch improv to correct conversion data
* 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
* minor fix in get_list of items in stock reconciliation
* reload doc fails because of backdated modified date
* item and item defaults should load prior to shopify refactor
* attribute value should't be none or empty, could be zero though
* Update item.py
* Add patch to set update_field and update_value
- set update_field and update_value if empty
since expense claim workflow is dependent on it.
* Set update_field for workflow state of leave application
* Update patch entry
* Fix bug
* Update set_update_field_and_value_in_workflow_state.py
* new doctype UOM category
* new doctype UOM Conversion Factor
* bootstrap json data for uom conversions
* uom conversion in item
* Patch to add all conversions and categories
* Fetch conversions multi-way
* fix codacy
* Rebase with develop
* [minor] Fix
* Add a test case
* Improvise as per review comment
* Add json data for UOMs
* Commonify function and call from patch
* Update uom_conversion_data.py
* 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
* move shopify settings to ERPNext
* [fix] setup webhook for order and validate webhook request
* validate webhook request
* sync customer and item if not exists while syncing order from shopify
* pull item from shopify and minor fixes
* fix method naming, mechanisim to register and withdraw webhooks, patch
* minor fix
* minor fixes
* [Patch][fix] use remove_from_installed_apps instead of remove app
* log exceptions
* add shopify logging for failed requests
* minor fixes
* fix test case
* codecy fixes
* check shared secret exists
* Test Case fixes
* UX fixes and patch fixes
* Documentation
* fixes
* [fix] dump webhooks request data into doctype
* Provision to resync the order if error occured in sync
* [fix] set default host
* Clinical Procesdure Template and Clinical Procedure Doctype
* Consultation - Create procedure and procedure prescription
* Patient Appointment - Create Procedure and Procedure appointment invoice
* Physician Schedule - Validate slot overlap
* Clinical Procedure Item - batch_no for Clinical Procedure not for Template
* Clinical Procedure - manage item batch_no
* Codacy - fixes
* Yet another Codacy and travic-ci fix
* Codacy - fixes
* Clinical Procedure - Codacy fix
* Permissions updated
* fixed Qty Indicators, Minor fixes
* Patient appointment for procedure prescription
* Doctype Patient Service Unit to Healthcare Service Unit
* Add healthcare service unit tree root
* Healthcare Service Unit - Tree view script
* Healthcare Service Unit - allow appointments check
* Clinical Procedure - remove unused variable
* Clinical Procedure - Get actual quantity from ledger - fix
* Clinical Procedure - apply transilation for message
* Warehouse in Healthcare Service Unit
* Service Unit in Clinical Procedure
* Codacy fix
* Missing semicolon
* Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account
* Patch added
* Dynamic link fields 'applicant' and 'applicant_type'
* Member link visible only if domain non profit is active
* Modified loan_dashboard
* Make Repayment Entry button
* Common file loan_common.js for loan and loan_application
* repayment schedule rows selection in dialog
* validation if repayment amount > total paid amount
* repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month
* fetch nowdate if disbursement date not found
* Rebased with develop
* updated non-profit module page
* updated patch for renamed fields
* dialog to select repayment entries
* hidden field to store reschedule paid status
* update paid check in loan on journal entry updation
* calculate total paid
* updated docs
* codacy fix
* child table employee expense approver
* set query in department
* mandatory approver check in hr settings
* triggers on leave and expense approver
* fetch all parent approvers from department hierarchy
* fixes
* patch to move employee approvers from employee to department
* removed hard coding of roles
* modify approvers list query
* commonified functions
* patch
* renamed standard reply occurrences
* removed leave approvers table from Employee master
* email templates for leave application notification
* set default email templates for leave in hr settings
* notify by email template
* approval status in expense claim
* render template in patch
* removed unused code
* Single child table department approver
* read instead of render template
* remove occurrences of Production Order
* rename from report and jsons
* Change Production Order to Work Order
* change occurences of production order from other files
* resolve minor conflict issues and reports
* patch added
* codacy fix
* updated patches, leftover changes
* rename reports, rectify patches
* [fix] #8427
* review comments changes
* Validation for reserved warhouse
* code improvements
* alignment
* test case
* message changes
* default warehouse / remove validation / change sql
* fix
* patch
* Fixed merge conflict
* Fixes and cleanups of reserve qty for subcontracting
* set from_warehouse only if purchase_order and purpose found (#12398)
* [HotFix] Validation issue for subcontract stock entry (#12127)
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
* Fixes and cleanups of reserve qty for subcontracting
* patch fixed
* Reload bin in patch
* [fix] set source warehouse in stock entry for manufacture
* [fix] #8540
* code alignment
* code alignment
* Move target warehouse validation to submit
* validation code improvement
* code changes for single stock entry
* validation fix
* call make_rm_stock_entry
* remove old stock entry method/rewrite test case
* Don't set bom_no against raw materials while trasferring items for sub-contracting
* minor fix
* New Document - Patient Service Unit
* Physician - schedule based on patient service unit
* Consultation - Remove validation on submit
* Consultation - Label changed from Drug Prescription to Medication
* Availability check and book appointment based on service unit, appointment invoice creation optimized
* patch fixes
* Patient Service Unit - field - overlap_appointments
* Patient Appointment - Service Unit based scheduling and booking
* Patient Appointment - issue fixed#13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment
* Codacy fixes on PR #13211
* Codacy fixes on PR #13211
* Fee validity test -fixes
* Fee Validity - test - fixes
* fix the status updater for multiple sources
* patch for updating the status
* patch for updating the sales order item
* Update update_status_for_multiple_source_in_po.py
* add child doctype - Cash Flow Mapping Account
* adds new doctype - Cash Flow Mapping
* adds new doctype - Cash Flow Mapper
* adds new doctype Cash Flow Mapping Template
* adds new doctype Cash Flow Mapping Template
* adds adjustments to Cash Flow Mapper:
- remove fields from Cash Flow Mapping Template Details
- update in Cash FLow Mapper
* get cash_flow_accouts from Cash Flow Mapping
* change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field
* changes description from 'Net Profit/Loss' to 'Profit for the year'
* set `net_profit_loss` `parent_account` properly
* modify `get_account_type_based_data`:
- changed signature such that `account_type` parameter is now `account_name`
- where clause in query is now based on `name`
* remove zero rows
* de-duplicates row, summing similar accounts in the process
* makes gl sum calculation use `parent_account` as a condition
* add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field
* adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities
* add "Movement in working capital" subheader
* refactor code for readability
* adds new fields to `Cash Flow Mapping`:
- `is_interest_paid` to allow me recognise accounts for 'Interest Paid'
- `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid'
* allow `Cash Flow Mapping` to be renamable
* adds new field - `section_subtotal` useful for only Operating Activities
* changes `Cash Flow Mapping` doctype fields:
- remove `is_income_tax`_field
- add `is_income_tax_liability` field to identify tax payable accounts
- add `is_income_tax_expense` field to identify tax expense accounts in P or L
* calculates and shows tax paid adjustment in cash flow statement
* renames `is_interest_paid` to `is_finance_cost`
* - adds finance costs calculation
- correctly sets opening balance dates
* prevents users from selecting extra options in Cash Flow Mapping
* adds validation to prevent selecting multiple options
* adds new fields to Cash Flow Mapping
* calculate non cash p or l items (2nd pass)
* separates default cash flow generation from custom
* adds new setting to Accounts Settings:
- allow user elect to use customised cash flow report
* clean up
* removes mandatory constraint from accounts field
* allow rename, disallow create and delete
* adds patch to add default Cash Flow Mappers
* refactors custom_cashflow
* add article to explain configuration
* refactor
* further refactor
* final clean up (hopefully)
* clean up for codacy
* more codacy fixes
* more codacy fixes
* fix broken patch
* rename article to .md
* create default mappers after install
* PEP 8
* create the tables in `after_install` call
* [enhance] Production plan
* Test cases
* Removed production planning tool
* Documentation
* Added actual qty in material request production item
* Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'
* added currency filter
* modified files
* pull margin only if currency matches
* Renamed price to rate in pricing rule
* fetch rate only if currency matches
* rebase with develop
* rebase with develop
* patch to set currency in existing docs
* currency field mandatory in pricing rule
* modified test cases
* rebase with develop
* fixed test case
* patch for custom workflow
* deleted field approval_status
* replaced approval_status with workflow_state
* updated test cases
* validation to check expense approver
* check if workflow_state_name already exists
* fixes
* modified notifications.py
* removed field exp_approval and modified test cases
