- Billing % should consider unreturned amount as total
- While mapping to return doc, map unreturned amount
- Added field Received Qty in Stock UOM, to tally against Returned Qty in PR
- PR billing percentage updation custom function
- In patch set received qty in stock uom first, then update returned qty and billing
* feat: Inpatient Medication Order
* feat: Inpatient Medication Entry
* feat: update medication orders on medication entry submission
* feat: added custom fields for medication references in Stock Entry
* feat: make stock entry if update stock is checked in IPMOE
* fix: handle cancel event for Inpatient Medication Entry
* fix(ux): add link and progress bar to dashboard
* refactor(ux): Adding Medication Orders without linking to Patient Encounter
* fix: make medication entry child table read only
* fix: filter stock items during manual medication order creation
* fix: codacy
* chore: tests for Inpatient Medication Order
* chore: tests for Inpatient Medication Entry
* fix: code clean-up
* fix: filter for inpatients in IPMO
* fix: add datetime validations for IPME filters
* fix: do not hardcode stock entry type
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* refactor: re-order fields in Issue DocType
* refactor: rename Mins to First Response to First Response Time
* refactor: First Response Time Reports for Issue and Opportunity
* fix: added patch for renamed fields and setting durations
* chore: update CRM and Support Desk Pages for Response Time reports
* fix: first response time for opportunity report
* fix: patch
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: returns can be made against unconsolidated invoices
* fix: indentation
* fix: mode of payment not fetching for pos returns
* patch: default pos profile print format
* fix: tests
* chore: clean up retail desk page
- Added frequency in Video Settings
- Cron job to check half hourly job
- Hourly job to run job based on frequency
- Patch to set youtube id in video for ease in computing
* fix: update the project after task deletion so that the % completed shows correct value
* fix: patch to correct % complete of previous projects
* fix: for version-13
* fix: removed patch from v13
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* refactor: add pos invoice doctype replacing sales invoice in POS
* refactor: move pos.py to pos invoice
* feat: add pos invoice merge log doctype
* feat: ability to merge pos invoices into a sales invoice
* feat: [wip] new ui for point of sale
* fix: pos.py moved to pos_invoice
* feat: loyalty points for POS Invoice
* fix: loyalty points on merging
* feat: return against pos invoices
* Merge 'fork/serial-no-selector' into refactor-pos-invoice
* chore: status fix and set warehouse from pos profile
* fix: naming series
* feat: merge pos returns into credit notes
* feat: add pos list action for merging into sales invoices
* feat[UX]: add shortcuts & focus on search after customer selection
* feat: stock validation from previous pos transactions
* Merge 'fork/serial-no-selector' into refactor-pos-invoice
* chore: fix df not found for base_amount precision
* feat: serial no validation from previous pos transactions
* chore: move pos.py into pos page
* feat: pos opening voucher
* feat: link pos closing voucher with opening voucher
* chore: use map_doc instead of get_mapped_doc for better perf
* feat: enforce opening voucher on pos page
* feat: [ui] [wip] point of sale beta ui refactor
* fix: auto fetching serial nos with batch no
* feat: [ui] item details section for new pos ui
* feat: remove item from cart
* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids
* fix: search from item selector
* feat: loyalty points as payment method
* feat: pos invoice status
* fix a bug with invalid JSON
* fix: loyalty program ui fixes
* feat: past order list and past order summary
* feat: (minor) setting discount from item details
* fix: adding item before customer selection
* feat: post order submission summary
* save and open draft orders
* fix: item group filter
* fix: item_det not defined while submitting sle
* fix: minor bugs
* fix: minor ux fixes
* feat: show opening time in pos ui
* feat: item and customer images
* feat: emailing and printing an invoice
* fix: item details field edit shows empty alert
* fix: (minor) ux fixes
* chore: rename pos opening voucher to pos opening entry
* chore: (minor) rename pos closing voucher and sub doctypes
* chore: add patch for renaming pos closing doctypes
* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation
* fix: invoices not getting fetched on pos closing
* fix: indentation
* feat: view / edit customer info
* fix: minor bugs
* fix: minor bug
* fix: patch
* fix: minor ux issues
* fix: remove uppercase status
* refactor: pos closing payment reconciliation
* fix: move pos invoice print formats to pos invoice doctype
* fix: ui issues
* feat: new child doctype to store pos payment mode details
* fix: add to patches.txt
* feat: search by serial no
* chore: [wip] code cleanup
* fix: item not selectable from cart
* chore: [wip] code cleanup
* fix: minor issues
* loyalty points transactions
* default payment mode
* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI
* chore: pos invoice merge log tests
* fix: batch / serial validation in pos ui and on submission
* feat: use onscan js for barcode scan events
* fix: cart header with amount column
* fix: validate batch no and qty in pos transactions
* chore: do not fetch closing balances as opening balance
* feat: show available qty in item selector
* feat: shortcuts
* fix: onscan.js not found
* fix: onscan.js not found
* fix: cannot return partial items
* fix: neagtive stock indicator
* feat: invoice discount
* fix: change available stock on warehouse change
* chore: cleanup code
* fix: pos profile payment method table
* feat: adding same item with different uom
* fix: loyalty points deleted after consolidation
* fix: enter loyalty amount instead of loyalty points
* chore: return print format
* feat: custom fields in pos view
* chore: pos invoice test
* chore: remove offline pos
* fix: cyclic dependency
* fix: cyclic dependency
* patch: remove pos page and order fixes
* chore: little fixes
* fix: patch perf and plural naming
* chore: tidy up pos invoice validation
* chore: move pos closing to accounts
* fix: move pos doctypes to accounts
* fix: move pos doctypes to accounts
* fix: item description in cart
* fix: item description in cart
* chore: loyalty tests
* minor fixes
* chore: rename point of sale beta to point of sale
* chore: reset past order summary on filter change
* chore: add point of sale to accounting desk
* fix: payment reconciliation table in pos closing
* fix: travis
* Update accounting.json
* fix: test cases
* fix: tests
* patch loyalty point entries
* fix: remove test
* default mode of payment is mandatory for pos transaction
* chore: remove unused checks from pos profile
* fix: loyalty point entry patch
* fix: numpad reset and patches
* fix: minor bugs
* fix: travis
* fix: travis
* fix: travis
* fix: travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* feat: option to add organism count in descriptive tests
print format to accommodate descriptive test changes
fix: refactoring, clean up wip
* lab test - result based on secondary uom, result format options
lab test print - consider result format options, result legend and worksheet instructions
* feat: option to allow results blank in lab test if configured via lab test template
* fix: rename child doctypes, rename related links
* fix: field display depends on, cleanup - rename fields and variables
* fix: get from encounter popup layout, code cleanup and minor fixes
* fix: sms send dialog bug
* fix: lab test get from encounter html class name typo corrected
* fix: lab test organisms depends on condition
* fix: reorder fields - depends on fields brought together
* fix: PR review feedback, removed : separator, result formatting applied to result UOM
* fix: child table js removed
* fix: internal field require_result_value hidden, secondary uom result field type set to data
* fix: Use ORM methods instead of db.sql, code cleanup, style
* fix: create item price for lab test template if billable, code cleanup
* fix: patch rename doctypes before fields, deleted renamed child doctypes
* fix: secondary uom result calc - warn user if calculation fails
* fix: patch to insert entries into renamed child tables
* fix: codacy issues
* fix: patch duplicate error as items are already migrated in v12 migrate
organisms child table field name updated
* fix: patch a bit lenghty, added comments
* fix: patch
* fix: require_result_value flag marked hidden
* fix: code cleanup-up
* fix: patch - lab_test rename field, lab_test_group_template select option corrected
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* feat: More controller deferred revenue booking
* fix: Query for last gl entry
* fix: Accounting Dimension for Deferred entries
* fix: Deferred revenue booking against paid invoices
* fix: Don not update outstanding on Deferred Entry submission
* fix: Naming fixes
* feat: Deferred revenue/expense booking based on months
* fix: Test case for fix monthly deferred revenue booking
* fix: Typo
* fix: Patch to update settings
* fix: Test case to book deferred expense via journal entry
* fix: Update field for better UX
* fix: Codacy
* fix: Change select field to checkbox
* 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
* fix: bom incorrect price list rate for raw material if price list currency is different from company currency
* fixed test cases
* fixed base_rate calculation and added plc_conversion_rate trigger
* fix: Add misssing dimensions in GL entries
* fix: Add project filter in trial balance report
* fix: Use current dimensions instead of dimensions from asset
* fix: item price not fetching when customer is unset in item price
* fix: item price of selling type has hidden supplier value
* fix: remove test variable
* fix: test
* patch: invalid customer/supplier based on item price type
* fix: invalid query
* fix: patch
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* feat: process deferred accounting
* feat: maintain entry for deferred accounting
* feat: add check for automatic deferred accounting entry
* feat: add build conditions for company and account
* fix: create record for automatic processing of deferred accounting
* feat: add custom naming series
* fix: change the deferred revenue creation via hooks
* fix: add client side validations
* test: creation of gl entries on submission of process deferred accounting
* fix: add multiple validations
* patch(accounts-settings): set automatically process deferred accounting entry
* fix: On cancel function for deferred entry
* fix: Send email per process instead of per invoice
* fix: Test cases
* fix: Label
* fix: Process deferred accounting fixes
* fix: Error flag
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
* fix: move Video Doctype from Education module to Core
* fix: patch to retain Permissions
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* feat: Payroll based on attendance and leave
* test: salary slip based 0n attendance
* feat: Payroll based on attendance
* fix: Codacy issues
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
* 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
- Refactored Report View
- Added Chart
- Added 'valid_till' date in Supplier Quotation
- Added patch to set valid_till and daily job to set expiry status
* fix: Update Received Qty in Material Request as per Stock UOM
* fix: Process each PR only once
* fix: minor suggested changes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* 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>
* 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
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* refactor: Expense Claim Cost Center
* fix: copy cost center from other row
* patch: set cost center in children based on parent
* fix: test cases for expense claim
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category
Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category
* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'
- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered
* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox
* fix(test): Asset
* fix: Asset Test and Patch
* fix(test): Opening Invoice Creation Tool
* Update asset.py
* fix: Patch and other fixes
* feat: Enhancement in landed cost voucher
* fix: Make GL entries based on ledgers in Landed cost voucher
* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry
* fix: Ability to select expense account in Stock Entry
* fix: Renaming and test case fixes
* fix: Test Cases
* fix: Additional cost in Stock Entry
* fix: Changed filters and test case fixes
* fix: Upadte filters in stokc entry expense account filter
* fix: company filter
* fix: produced_qty field hidden and not updated in sales order item
* fix: added patch for old sales orders
* fix: produced_qty for sales order item linked to multiple work orders
* fix: comment
* fix: function for updating produced_qty in SO Item
* fix: remove frappe.db.commit
* fix(journal-entry): change fieldname from bank account no to bank account
* fix: add payroll entry in bank dashboard
* fix: fetch account from bank account
* fix: minor changes
* patch: check for bank account no column before updating
* fix: use rename field function
* feat: Add default energy point rules during install
* fix: Add completed_by field to task doctype
* fix: Rule data
* fix: Add default rules for opportunity
* fix: Add a patch to create default energy point rules
* fix: Default success action message
* fix: Use .items() instead of .iteritems()
* fix: Add "create_default_energy_points" patch entry
* fix: Reload Energy Point Rule to fix patch
* fix: Import frappe
* feat(plaid): move plaid from site_config to doctype
plaid requires accessing site_config and cloud users cannot access
site_config and hence, plaid integration doesn't work on the cloud.
Moving all the configuration from site_config to the Plaid Settings
doctype fixes this issue.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* feat(plaid): make changes to plaid_settings and add patch
* remove all references for get()-ing plaid variables from frappe.conf
and replace them with values from doctype
* add patch to move all existing plaid settings variable values from
frappe.conf to plaid_settings doctype
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* fix(plaid): use get_single_value for Plaid Settings
Co-Authored-By: Himanshu <himanshuwarekar@yahoo.com>
* chore: reload plaid_settings before running patch
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: remove useless semicolon
fuck codacy
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* Page - Patient History
* Healthcare Utils - get patient vitals
* Healthcare Utils - render doc as html for patient history page
* Page - Patient History - prcatitioner image in time line
* Page - Patient History in menu
* fix - page medical history
* fix: page patient_history broken img, minor fixes
* fix: patient_history page, add pagination, show doc if fetched
* fix: Patient Medical Record to Patient History
* fix: patient history page - set route options
* fix: update to code standards
* fix: remove Eidt button form patient history
* fix: css update to code standards
* fix: Remove page medical_record
* 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
