Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,420 Commits 3 Branches 0 Tags
Commit Graph

46420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
61be373800
Merge pull request #36107 from GursheenK/accounting_dimension_in_based_on_filter 
feat: filtering based on accounting dimensions in profitability analysis
 2023-07-25 14:28:46 +05:30
RitvikSardana
62ca89b10f
fix: POS background color optimized in dark mode (#36287) 
fix: POS dark theme compatability

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
 2023-07-25 13:01:10 +05:30
Gursheen Anand
e6d66fe5b0 fix: gst itemised registers for india compliance api call 2023-07-25 12:14:37 +05:30
Deepesh Garg
30554301c9
Merge pull request #36235 from resilient-tech/fix-tax-breakup-for-diff-tax-rates 
fix: Correct Tax Breakup for different tax rates for same hsn code
 2023-07-24 20:57:26 +05:30
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint 
refactor(ci): add eslint and update linting confs
 2023-07-24 20:55:07 +05:30
Smit Vora
1b8490dc98
Merge branch 'develop' into fix-tax-breakup-for-diff-tax-rates 2023-07-24 20:20:19 +05:30
mergify[bot]
1bc87a970a
fix: set new purchase_receipt_amount on asset split (copy #36272) (#36280) 
fix: set new purchase_receipt_amount on asset split

(cherry picked from commit 7fd9b489eed33a81f29ecb3802d8a07d232c4c9c)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-07-24 19:37:07 +05:30
Deepesh Garg
4867a767a2
Merge pull request #36278 from resilient-tech/set-company-flag 
fix(regional): set `frappe.flags.company` temporarily, where required
 2023-07-24 19:34:29 +05:30
Sagar Vora
4205f564a0 fix(regional): set frappe.flags.company temporarily, where required 2023-07-24 18:37:58 +05:30
DaizyModi
6f376cf103 fix: remove unused params 2023-07-24 18:02:42 +05:30
Gursheen Anand
db49d53aaf fix: running balance after sorting 2023-07-24 17:42:13 +05:30
Deepesh Garg
164df33419
Merge pull request #36274 from GursheenK/process-soa-customer-filter 
fix: customer filter in process soa
 2023-07-24 17:32:17 +05:30
Gursheen Anand
5224f13db2 fix: add patch for renaming tds payable report 2023-07-24 17:11:05 +05:30
Gursheen Anand
34d7fb388d fix: customer filter in process soa 2023-07-24 16:47:06 +05:30
mergify[bot]
1436040d4c
fix: allow both custodian and location while creating asset (copy #36263) (#36264) 
fix: allow both custodian and location while creating asset

(cherry picked from commit bff00bc8b2c8911f1513a25f066077e2b0c0adf0)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-07-24 15:51:24 +05:30
ruthra kumar
4464b2a21b
Merge pull request #36261 from ruthra-kumar/possible_missing_field_error_on_payment_entry 
refactor: apply terms based validation only on sales/purchase doctypes
 2023-07-24 15:22:15 +05:30
rohitwaghchaure
7f4dda1b06
Merge pull request #36259 from rohitwaghchaure/fixed-report-default-email-outgoing-error 
fix: no default email account causing reposting issue
 2023-07-24 15:03:09 +05:30
ruthra kumar
3dd119eeea refactor: apply terms based validation only on sales/purchase doctyp 2023-07-24 14:50:11 +05:30
ruthra kumar
a785a6054e
Merge pull request #36251 from ruthra-kumar/performance_tune_timsheet_adding_logic 
fix: unresponsive sales invoice page
 2023-07-24 14:01:07 +05:30
Rohit Waghchaure
efb51526a9 fix: no default email account causing reposting issue 2023-07-24 14:00:20 +05:30
Ritvik Sardana
8b4228d616 fix: removed duplicate code 2023-07-24 13:59:24 +05:30
Ritvik Sardana
5389dabe19 Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-pos-dark 2023-07-24 12:48:58 +05:30
Ritvik Sardana
82b36e2ec8 fix: added test for pos closing without item code 2023-07-24 12:47:29 +05:30
Deepesh Garg
203b8ec872
Merge pull request #36220 from marination/dunning-patch-acc-frozen 
fix: Patch Dunnings after accounts were frozen
 2023-07-24 12:46:32 +05:30
ruthra kumar
740f283ec1
Merge pull request #36241 from ruthra-kumar/fix_allocation_logic_in_get_outstanding_invoices 
fix: multiple fixes on payment terms based issues in payment entry
 2023-07-24 12:35:25 +05:30
Deepesh Garg
4bb6db86f8 fix: Remove auto repeat (subscription) button from Sales and Purchase documents 2023-07-24 12:29:57 +05:30
Gursheen Anand
2f6d0bdcee fix: col names for party types 2023-07-24 12:20:58 +05:30
Gursheen Anand
38b501e004 fix: make party type filter mandatory 2023-07-24 12:13:47 +05:30
Deepesh Garg
3c92686f0a fix: Default year start and end dates in reports 2023-07-24 11:58:16 +05:30
David Arnold
b740cdfc00
build(deps): update tweepy 3.10.0 -> 4.14.0 2023-07-23 23:14:58 -05:00
David Arnold
d066b5cd04
fix(startup): coa drill down 2023-07-23 22:44:19 -05:00
Deepesh Garg
cdc9b62688 chore: Remove cur_frm from sales_invoice.js 2023-07-23 22:44:18 +05:30
Deepesh Garg
8d3d9493f0 chore: linting issues 2023-07-23 20:06:41 +05:30
ruthra kumar
d048365da3 refactor: refresh table once after loop ends 2023-07-23 19:56:30 +05:30
Deepesh Garg
0d70ae2a21 chore: Ingnore issues 2023-07-23 19:34:08 +05:30
Deepesh Garg
8ccb8e3c5b chore: Move buying controller to utils 2023-07-23 18:50:44 +05:30
Deepesh Garg
7205fb9b97 chore: convert sales common to utils 2023-07-23 12:07:21 +05:30
ruthra kumar
ec7558b9e0 refactor: handle references without any template and payment_term 2023-07-23 11:55:16 +05:30
ruthra kumar
662ccd467c fix: allocation logic on 'Get Outstanding Invoices' btn in PE 
1. fixed broken `payment_term` filter in Payment References section
2. Throw error if user fails to select 'Payment Term' for an invoice
with 'Payment Term based allocation' enabled.
 2023-07-23 11:37:27 +05:30
Deepesh Garg
4077254b01 chore: resolve undefined variables issue 2023-07-22 23:07:18 +05:30
Deepesh Garg
0b1e78e127 chore: Add landed cost taxes and charges common in bundles 2023-07-22 21:19:48 +05:30
Deepesh Garg
6b2dbdd394
Merge branch 'develop' into skip_tcs 2023-07-22 18:38:45 +05:30
ruthra kumar
e6abe1b77f
Merge pull request #36206 from ruthra-kumar/test_cases_for_payment_term_overallocation 
test: overallocation validation in payment entry
 2023-07-22 10:41:01 +05:30
ruthra kumar
93246043ec chore(test): enable multi-currency party for testing 2023-07-22 10:01:59 +05:30
ruthra kumar
8f9ef4ef5b chore: validation on multi-currency tran on company curtency account 2023-07-22 09:20:55 +05:30
ruthra kumar
5b37919574 chore: use flt for currency 2023-07-22 09:20:55 +05:30
ruthra kumar
6b4a81ee48 chore: test more scenarios 2023-07-22 09:20:44 +05:30
DaizyModi
653117c2a9 test: fix test case for itemised tax breakup 2023-07-21 17:56:33 +05:30
DaizyModi
b84deec601 fix: Correct Tax Breakup for different tax rates for same hsn code 2023-07-21 17:43:27 +05:30
Ritvik Sardana
7069e2a5a0 fix: removed validate_item_code function in sales_invoice 2023-07-21 17:18:35 +05:30