Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
brotherton-erpnext/erpnext/accounts/doctype
History
Frappe PR Bot 512ddc589f
fix: timesheet amount issue (#25993) (#26889) 
* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement

(cherry picked from commit a6aa6cd7d63eb426b986d995985985c2aae4f553)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-24 22:00:32 +05:30
..
account
fix: typo in error message (#26816) (#26817)
2021-08-04 22:01:17 +05:30
accounting_dimension
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
accounting_dimension_detail
fix: Default dimensions in child doctypes
2019-08-15 17:06:32 +05:30
accounting_dimension_filter
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
accounting_period
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
accounts_settings
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
advance_taxes_and_charges
fix: Add multiple fixes
2021-06-09 22:55:10 +05:30
allowed_dimension
fix: Label changes
2020-11-25 14:01:57 +05:30
allowed_to_transact_with
fix: Patch test
2020-05-01 13:26:26 +05:30
applicable_on_account
fix: Label changes
2020-11-25 14:01:57 +05:30
bank
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
bank_account
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
bank_account_subtype
fix: Rename bank account type doctypes (#21179)
2020-04-23 12:19:30 +05:30
bank_account_type
fix: Rename bank account type doctypes (#21179)
2020-04-23 12:19:30 +05:30
bank_clearance
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
bank_clearance_detail
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
bank_guarantee
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
bank_reconciliation_tool
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
bank_statement_import
fix: Bank statement import
2021-07-04 20:33:36 +05:30
bank_transaction
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
bank_transaction_mapping
fix: Missing commits from hotfix branch (#17997)
2019-07-03 10:34:31 +05:30
bank_transaction_payments
fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions
2020-02-18 17:49:57 +05:30
budget
fix: failing budget test due to project naming (#26834)
2021-08-06 17:37:17 +05:30
budget_account
…
c_form
perf(minor): remove unnecessary comprehensions (port #25645)
2021-06-11 18:40:22 +05:30
c_form_invoice_detail
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
campaign_item
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
cash_flow_mapper
…
cash_flow_mapping
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
cash_flow_mapping_accounts
…
cash_flow_mapping_template
…
cash_flow_mapping_template_details
…
cashier_closing
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
cashier_closing_payments
…
chart_of_accounts_importer
fix: missing parameter 'country'
2021-07-17 14:42:38 -04:00
cheque_print_template
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
closed_document
…
cost_center
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
coupon_code
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
customer_group_item
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
customer_item
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
discounted_invoice
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
distributed_cost_center
feat(Cost Center): Distributed Cost Center (#21531)
2020-06-08 12:20:21 +05:30
dunning
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
dunning_letter_text
feat: Dunning (#22559)
2020-07-23 15:45:03 +05:30
dunning_type
feat: Dunning (#22559)
2020-07-23 15:45:03 +05:30
exchange_rate_revaluation
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
exchange_rate_revaluation_account
fix: add a more descriptive message when no records are found (#18082)
2019-06-28 12:38:40 +05:30
finance_book
fix: incorrect gl entry on period closing involving finance books (#26921)
2021-08-24 17:26:23 +05:30
fiscal_year
chore: frappe.whitelist for doc methods (#25068)
2021-03-31 12:30:32 +05:30
fiscal_year_company
…
gl_entry
perf: various minor perf fixes for ledger postings (#26775)
2021-08-11 11:17:50 +05:30
gst_account
feat(India): Multiple GST enhancement and fixes (#25249)
2021-05-14 12:17:41 +05:30
invoice_discounting
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
item_tax_template
fix: autoname for Item Tax Template
2021-03-10 10:24:43 +05:30
item_tax_template_detail
…
journal_entry
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
journal_entry_account
fix: Backport missing commits to develop branch (#25305)
2021-04-13 15:46:01 +05:30
journal_entry_template
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
journal_entry_template_account
rename je template account dt
2020-04-25 18:13:01 +05:30
loyalty_point_entry
refactor: POS workflow (#20789)
2020-07-23 18:51:26 +05:30
loyalty_point_entry_redemption
…
loyalty_program
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
loyalty_program_collection
…
mode_of_payment
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
mode_of_payment_account
…
monthly_distribution
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
monthly_distribution_percentage
…
opening_invoice_creation_tool
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
opening_invoice_creation_tool_item
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-29 12:14:49 +05:30
party_account
fix: make account field non-mandatory
2021-04-07 20:03:33 +02:00
payment_entry
Merge branch 'develop' into payment_entry_validations_and_trigger_develop
2021-08-23 10:34:28 +05:30
payment_entry_deduction
feat: Tax deduction against advance payments
2021-05-25 17:20:52 +05:30
payment_entry_reference
fix: exchange gain loss not set for advances linked with invoices (#26436)
2021-07-12 18:33:16 +05:30
payment_gateway_account
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
payment_order
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
payment_order_reference
fix: capture advance payments in payment order
2020-09-04 12:17:56 +05:30
payment_reconciliation
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
payment_reconciliation_invoice
fix: Multi currency payment reconciliation (#22738)
2020-07-22 17:59:37 +05:30
payment_reconciliation_payment
fix: Multi currency payment reconciliation (#22738)
2020-07-22 17:59:37 +05:30
payment_request
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
payment_schedule
refactor: remove extra fields
2021-04-29 18:12:36 +05:30
payment_term
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
payment_terms_template
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
payment_terms_template_detail
feat: discount configuration on early payments (#25089)
2021-03-31 15:52:51 +05:30
period_closing_voucher
fix: incorrect gl entry on period closing involving finance books (#26921)
2021-08-24 17:26:23 +05:30
pos_closing_entry
fix: pos closing entry cancellation test (#27099)
2021-08-24 15:37:00 +05:30
pos_closing_entry_detail
fix(pos): return case for item with available qty equal to one (#25760)
2021-05-21 16:32:56 +05:30
pos_closing_entry_taxes
refactor: POS workflow (#20789)
2020-07-23 18:51:26 +05:30
pos_customer_group
…
pos_field
feat: provision to select the custom fields in the online POS
2019-12-26 11:59:19 +05:30
pos_invoice
fix: pos invoice test (#27113)
2021-08-24 19:45:21 +05:30
pos_invoice_item
Merge branch 'develop' into tcs_calculation
2021-02-23 15:56:29 +05:30
pos_invoice_merge_log
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
pos_invoice_reference
refactor: POS workflow (#20789)
2020-07-23 18:51:26 +05:30
pos_item_group
…
pos_opening_entry
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
pos_opening_entry_detail
refactor: POS workflow (#20789)
2020-07-23 18:51:26 +05:30
pos_payment_method
fix: multiple pos issues (#23725)
2020-10-26 13:24:47 +05:30
pos_profile
fix: Backport missing commits to develop branch (#25305)
2021-04-13 15:46:01 +05:30
pos_profile_user
refactor: POS workflow (#20789)
2020-07-23 18:51:26 +05:30
pos_search_fields
feat: enable custom field search on POS (#25421)
2021-04-26 22:48:13 +05:30
pos_settings
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
pricing_rule
feat: coupon code discount in pos invoice (#27004)
2021-08-24 16:22:46 +05:30
pricing_rule_brand
…
pricing_rule_detail
…
pricing_rule_item_code
…
pricing_rule_item_group
…
process_deferred_accounting
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
process_statement_of_accounts
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
process_statement_of_accounts_customer
feat(Accounting): Process Statement Of Accounts (#22901)
2020-08-11 16:23:47 +05:30
promotional_scheme
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
promotional_scheme_price_discount
fix(ux): removed rate from grid view
2021-08-19 15:53:55 +05:30
promotional_scheme_product_discount
feat: recursive product discount
2021-03-26 19:05:43 +05:30
psoa_cost_center
feat(Accounting): Process Statement Of Accounts (#22901)
2020-08-11 16:23:47 +05:30
psoa_project
feat(Accounting): Process Statement Of Accounts (#22901)
2020-08-11 16:23:47 +05:30
purchase_invoice
refactor: scan barcode field scanning (#26990)
2021-08-20 11:09:51 +05:30
purchase_invoice_advance
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
purchase_invoice_item
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
purchase_taxes_and_charges
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
purchase_taxes_and_charges_template
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
salary_component_account
feat: multi-currency payroll (#23519)
2020-12-01 09:11:05 +05:30
sales_invoice
fix: timesheet amount issue (#25993) (#26889)
2021-08-24 22:00:32 +05:30
sales_invoice_advance
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
sales_invoice_item
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
sales_invoice_payment
fix: Bank Clearance of POS purchase invoice (#22882)
2020-08-03 20:42:15 +05:30
sales_invoice_timesheet
fix: timesheet amount issue (#25993)
2021-08-10 20:32:15 +05:30
sales_partner_item
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
sales_taxes_and_charges
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
sales_taxes_and_charges_template
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
share_balance
…
share_transfer
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
share_type
fix: Dashboards for doctypes in accounting module
2019-05-23 11:29:39 +05:30
shareholder
refactor: Share transfer cancellation and code cleanup
2019-11-18 17:52:19 +05:30
shipping_rule
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
shipping_rule_condition
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
shipping_rule_country
…
south_africa_vat_account
feat: South Africa VAT report
2021-07-14 12:33:45 +05:30
subscription
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
subscription_invoice
fix: Multiple fixes in subscription
2021-02-09 16:13:45 +05:30
subscription_plan
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
subscription_plan_detail
feat: Enhancement in subscription (#22263)
2020-07-23 11:11:23 +05:30
subscription_settings
feat: Enhancement in subscription (#22263)
2020-07-23 11:11:23 +05:30
supplier_group_item
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
supplier_item
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
tax_category
fix: make quick entry for Tax Category work
2021-03-03 11:52:48 +01:00
tax_rule
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
tax_withholding_account
…
tax_withholding_category
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
tax_withholding_rate
…
territory_item
refactor: removed py2 code
2021-08-10 11:41:29 +05:30
__init__.py
…