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

8318 Commits

Author SHA1 Message Date
ruthra kumar
2175784142
Merge pull request #33303 from ruthra-kumar/incorrect_balance_on_consolidate_balance_sheet 
fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch
 2022-12-13 09:04:13 +05:30
barredterra
f20370c5ef refactor: translatable strings and guard clause 2022-12-13 02:36:12 +01:00
barredterra
e057e1dfe7 feat: incoterm named place 2022-12-12 18:49:47 +01:00
ruthra kumar
7b3316dc31 fix: incorrect balance on parent company due to key mismatch 2022-12-12 20:15:59 +05:30
anandbaburajan
b997d1eb87 chore: add some validation, shorten some function names 2022-12-12 17:25:38 +05:30
Anand Baburajan
f8cd424559
Merge branch 'develop' into asset_depreciation_schedule 2022-12-12 16:36:59 +05:30
anandbaburajan
ec6505d747 chore: fix some bugs, refactor some functions, add proper notes 2022-12-12 16:35:30 +05:30
Ankush Menat
915e0347b0
chore!: remove activity log feeds (#33294) 
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
  log to the point where activity page doesn't even load.
 2022-12-12 15:14:30 +05:30
Ankush Menat
593626f502
perf: add indexes on payment entry reference (#33288) 
Adds index on:
1. reference doctype
2. reference name

*Why not composite index?*

There are three type of queries on this doctype

- filtering ref_doctype - doctype index helps here
- filtering ref_name - name index helps here
- filtering both - name index helps here too. Since it has sufficiently
  high cardinality. Composite index wont help in case where ref_doctype
  isn't specfied.


[skip ci]
 2022-12-12 12:58:11 +05:30
artykbasar
d512919f5c
Subscription Cost center value is fixed to Default value(Bug fix) 
self.cost_center 
    field value keeps changing to 
erpnext.get_default_cost_center(self.get("company"))
    after validation of this doctype. This overrides the user input.
simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.
 2022-12-11 08:51:34 +00:00
anandbaburajan
90e1b9cb3d chore: fix asset depr schedule notes 2022-12-09 16:18:40 +05:30
anandbaburajan
16365bfca3 chore: more refactoring 2022-12-09 14:04:00 +05:30
Devin Slauenwhite
2010b1b6e8 fix: use highest precision for exchange rate. 2022-12-08 16:26:07 -05:00
anandbaburajan
1fd73af744 chore: refactor some reports 2022-12-09 00:28:34 +05:30
Deepesh Garg
6db52930d8 Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule 2022-12-08 18:05:05 +05:30
Deepesh Garg
6192af5cf0 chore: Update tests 2022-12-08 18:04:40 +05:30
sonali
8e7c8a6482 Update bank_reconciliation_tool.json 
Adding fields in bank reconciliation tool
 2022-12-08 17:23:08 +05:30
Ankush Menat
0b86b1baca
refactor: make payments app a soft dependency (#33245) 
refactor: make payment app a soft dependency
 2022-12-08 16:40:13 +05:30
sonali
447272aa4d Filters on Bank Reconciliation 
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
 2022-12-08 16:11:53 +05:30
sonali
e5a1189bec Update bank_reconciliation_tool.py 
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order.
Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
 2022-12-08 13:29:28 +05:30
anandbaburajan
18fc2b5695 chore: fix bug in unlink_asset_reference 2022-12-06 23:34:56 +05:30
Deepesh Garg
c1a82dc9e5
Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report 
fix: key error while filtering on date range and reporting on foreign currency
 2022-12-06 15:42:53 +05:30
ruthra kumar
a6794c3606 fix: key error on p/l and balance sheet reports on foreign currency 2022-12-06 13:48:46 +05:30
ruthra kumar
19db7e2989 fix: replace sql code with fields list in get_cached_value 2022-12-06 13:48:46 +05:30
Deepesh Garg
3aa6f97420
Merge pull request #33216 from barredterra/validate-accounts-dates 
refactor: validate dates in accounts module
 2022-12-06 12:33:01 +05:30
Deepesh Garg
921f8edde8
Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate 
fix: Allow item rate updates for non-stock invoices
 2022-12-06 09:12:24 +05:30
Raffael Meyer
8301d3b13f
Merge branch 'develop' into key_error_in_profit_loss_report 2022-12-06 02:08:47 +01:00
barredterra
a26a29f33b fix: incorrect dates in test records 2022-12-05 19:49:05 +01:00
Raffael Meyer
e526a0e282
Merge branch 'develop' into validate-accounts-dates 2022-12-05 19:37:54 +01:00
ruthra kumar
3814db02eb fix: data import mandatory account_head, charge_type 2022-12-05 16:24:05 +05:30
Deepesh Garg
5f821b93a5 chore: Add POS Invoices 2022-12-05 15:43:03 +05:30
Deepesh Garg
ef9d126254 fix: Allow item rate udpates for non-stock invoices 2022-12-05 10:17:19 +05:30
barredterra
eb66b749b2 refactor: validate dates in accounts module 2022-12-04 14:41:21 +01:00
Deepesh Garg
b741ae143c fix: Reapply pricing rule on qty change 2022-12-02 17:14:06 +05:30
Deepesh Garg
f54838ab56 fix: Buying and selling check in pricing rule 2022-12-01 21:23:17 +05:30
anandbaburajan
f20238fa3e chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data 2022-12-01 15:15:32 +05:30
ruthra kumar
9b8d6fe411 fix: key error while filtering on date range and different currency 2022-12-01 13:38:41 +05:30
Deepesh Garg
3eb1ed19a1 fix: Tax withholding net total for PI in reports 2022-11-29 13:10:31 +05:30
Deepesh Garg
8253f4379f
Merge pull request #33098 from ssiyad/fix/pos/warehouse_selection 
fix(pos): warehouse selection
 2022-11-29 10:15:31 +05:30
Deepesh Garg
bdb15c3331
Merge pull request #33112 from ssiyad/fix/pos/customer_group_filter 
fix(pos): filter on customer groups
 2022-11-29 09:55:56 +05:30
Deepesh Garg
8112493c3c
Merge pull request #33138 from deepeshgarg007/bank_reco_button_fix 
fix(ux): Action buttons in Bank Reconciliation
 2022-11-29 09:23:21 +05:30
Deepesh Garg
6ebe8ad60d fix(ux): Action buttons in Bank Reconciliation 2022-11-28 17:37:41 +05:30
Deepesh Garg
f6126069ee
Merge pull request #33129 from deepeshgarg007/accounts_settings_fix 
chore: Supplier invoice no field description
 2022-11-28 13:05:12 +05:30
Deepesh Garg
4f2ece34df chore: Supplier invoice no field description 2022-11-27 21:50:26 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms 2022-11-25 16:50:55 +01:00
anandbaburajan
7d09440579 chore: more refactoring 2022-11-25 16:49:44 +05:30
Sabu Siyad
cc63415887
fix(pos): filter on customer groups 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-25 15:10:01 +05:30
anandbaburajan
4e63ba3ac6 chore: refactor schedules in journal_entry 2022-11-24 17:39:11 +05:30
Sabu Siyad
4ad0e2ed7e
feat(pos): invoice: fitler warehouse by company 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-24 16:11:26 +05:30
Sabu Siyad
95a620a30d
fix(pos): warehouse should be in company 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-24 15:40:05 +05:30
Deepesh Garg
3724f2287c
Merge pull request #33092 from deepeshgarg007/debit_credit_issue 
fix: Debit and Credit not equal while submitting PI containing asset item
 2022-11-24 14:42:56 +05:30
Deepesh Garg
dc8d635120 fix: Debit and Credit not equal while submitting PI containing asset item 2022-11-23 20:29:12 +05:30
Deepesh Garg
7a7b8c2284
Merge pull request #32836 from resilient-tech/perf-fix-get-cached-value-for-accounts 
perf: use `get_cached_value` instead of `db.get_value` in accounts module
 2022-11-23 18:20:48 +05:30
Deepesh Garg
a3c81da890
Merge pull request #33062 from nabinhait/pcv-rounding-issue 
fix: create rounding gl entry for PCV during gle post processing
 2022-11-23 10:36:04 +05:30
Deepesh Garg
06c9c679e6
Merge pull request #33063 from niralisatapara/tds_purchase_order 
feat: item wise tds in purchase order
 2022-11-23 09:52:00 +05:30
Deepesh Garg
34e775136d
Merge pull request #33069 from deepeshgarg007/jv_filter 
fix: Remove unnecessary filters from Journal Entry
 2022-11-22 20:15:12 +05:30
Deepesh Garg
eb74362263
Merge pull request #33068 from deepeshgarg007/payment_button_visibility 
fix: Don't show payment button for invoices on hold
 2022-11-22 20:14:41 +05:30
niralisatapara
46e8cdf31a feat: item wise tds calculation for purchase order. 2022-11-22 14:15:36 +05:30
Deepesh Garg
e96be712b8 chore: Rearrange supplier invoice section in Purchase Invoice 2022-11-22 12:50:00 +05:30
Deepesh Garg
cd88a53533 fix: Remove unnecessary filters from Journal Entry 2022-11-21 22:21:03 +05:30
Deepesh Garg
1b9e83251f fix: Don't show payment button for invoices on hold 2022-11-21 21:50:55 +05:30
Nabin Hait
022d8d5d79 fix: create rounding gl entry for PCV during gle post processing 2022-11-21 15:16:53 +05:30
Deepesh Garg
15e74c5d7b fix: Viewing account ledger from party master 2022-11-20 20:30:24 +05:30
Deepesh Garg
26dcde2931
Merge pull request #32999 from ruthra-kumar/exchange_rate_reval_company_currency 
fix: incorrect currency in Exchange rate revaluation
 2022-11-19 18:30:03 +05:30
Deepesh Garg
f96c66bbc0
Merge pull request #33032 from deepeshgarg007/dimension_report_filtering 
fix: Accounting Dimension filtering for Sales and Purchase Report
 2022-11-19 18:19:37 +05:30
gavin
dd2493a541
fix(realtime): Restrict updates to only last modified or current user (#33034) 2022-11-18 17:17:54 +05:30
ruthra kumar
5caaccc94b fix: always send account currency in response 2022-11-18 17:10:39 +05:30
ruthra kumar
68b04e2577 fix: incorrect currency in Exchange rate revaluation 2022-11-18 17:10:39 +05:30
Deepesh Garg
df096688f7
Merge pull request #33014 from deepeshgarg007/multi_invoice_payment 
fix: Bulk payment generation against invoices
 2022-11-18 15:10:35 +05:30
Deepesh Garg
8b394afaa9 fix: Accounting Dimension filtering for Sales and Purchase Report 2022-11-18 15:07:12 +05:30
barredterra
77105306f2 feat: add incoterm to purchasing transactions 2022-11-17 22:18:26 +01:00
barredterra
029f22c549 feat: add incoterm to sales transactions 2022-11-17 22:17:59 +01:00
Sagar Vora
48413b0778 fix: reduce function call 2022-11-18 02:22:43 +05:30
Sagar Vora
66ac65482d fix: add missing comma 2022-11-18 02:16:56 +05:30
Sagar Vora
8ae58ed427 fix: use doc_before_save and other changes 2022-11-18 02:13:16 +05:30
Daizy Modi
fdfe5cbf93 fix: use get_cached_value to avoid db call with db.exists 2022-11-17 19:14:10 +05:30
Daizy Modi
678a4c33da fix: resolved merge conflicts 2022-11-17 19:13:10 +05:30
Sagar Sharma
29a8d9a9b4
Merge branch 'develop' into internal_transfer 2022-11-17 16:42:18 +05:30
Deepesh Garg
2dfe849c7d fix: Bulk payment generation against invoices 2022-11-17 15:53:56 +05:30
Deepesh Garg
3a523b56bf
Merge pull request #32983 from deepeshgarg007/journal_entry_template_fix 
fix: Opening journal entry templates
 2022-11-16 20:41:07 +05:30
Vishal
71412f6877 fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt 2022-11-16 13:53:21 +05:30
Nabin Hait
b89b07d0ff fix: Validate for deferred revenue only if sales invoice needs repost 2022-11-16 12:16:23 +05:30
Deepesh Garg
33b61aef5a fix: Opening journal entry templates 2022-11-16 11:57:17 +05:30
Gavin D'souza
35088bb4c4 chore(payment_entry): Remove dead validations 
(cherry picked from commit e1ecc9a81973d20084f5a053d8d0155354079b2e)
 2022-11-15 08:34:08 +00:00
Deepesh Garg
a0d9e1bd57
Merge pull request #32962 from deepeshgarg007/return_write_off 
fix: Write Off section visibility for non POS Invoices
 2022-11-15 13:01:06 +05:30
Deepesh Garg
9f5d613c78 fix: Write Off section visibility for non POS Invoices 2022-11-15 09:45:39 +05:30
Deepesh Garg
a1a992b0dd
Merge pull request #32956 from deepeshgarg007/acc_dimension_filter_label 
fix: Label for applicable dimension table
 2022-11-15 09:24:30 +05:30
Deepesh Garg
8c13f70fc5 fix: Label for applicable dimension table 2022-11-14 20:39:40 +05:30
Sagar Vora
b06345af46 fix: check type for reference name 2022-11-13 19:58:49 +05:30
Deepesh Garg
a2260a3dc2
Merge branch 'develop' into bg_query 2022-11-13 19:47:43 +05:30
Deepesh Garg
6b93b3f12a
Merge pull request #32866 from ruthra-kumar/gross_profit_fix_buying_amount 
fix: incorrect buying amount on Gross Profit
 2022-11-13 19:15:03 +05:30
Deepesh Garg
4b9921782b chore: Remove qb doc reference 2022-11-13 18:48:32 +05:30
Deepesh Garg
42a59d5c17 chore: Remove raw SQL query 2022-11-12 17:32:04 +05:30
ruthra kumar
2c8b0b17a7 test: buying amount of invoices 
1. Invoice with unset `update_stock`, with and without Delivery Notes
 2022-11-11 08:33:54 +05:30
ruthra kumar
e4d16c31da fix: GP incorrect buying amount if no upd on SI and Delivery Note 2022-11-11 08:33:48 +05:30
rohitwaghchaure
8ae9c1d192
Merge pull request #32895 from rohitwaghchaure/fixed-performance-issue-for-purchase-receipt 
fix: Purchase Receipt timeout error
 2022-11-10 22:41:54 +05:30
Deepesh Garg
f4920d6475
Merge pull request #32880 from ernestoruiz89/patch-7 
fix: add translate function to valitate company msg in chart of accounts importer
 2022-11-10 20:07:52 +05:30
Deepesh Garg
e559fea8ff
Merge pull request #32921 from deepeshgarg007/netvalues_psoa 
feat: Add net value filter on PSOA
 2022-11-10 19:51:56 +05:30
Deepesh Garg
51521fc19f feat: Add net value filter on PSOA 2022-11-10 17:48:25 +05:30
Ernesto Ruiz
a007f1da9d
Merge branch 'develop' into patch-7 2022-11-09 15:53:36 -06:00
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods (#32914) 
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815
 2022-11-09 20:09:06 +05:30
Deepesh Garg
ff51f3b95e
Merge branch 'develop' into patch-7 2022-11-09 14:34:39 +05:30
Deepesh Garg
5f1b226362
Merge pull request #32742 from ruthra-kumar/ple_repost 
feat: Tool to repost PLE manually
 2022-11-09 14:26:37 +05:30
Rohit Waghchaure
4082149f0e fix: Purchase Receipt timeout error 2022-11-08 20:59:20 +05:30
ruthra kumar
0448c0fa36 feat: Repost Payment Ledger entries for vouchers 
primarily intended to manually correct PLE entries for vouchers
affected by Item Value repost-https://github.com/frappe/erpnext/pull/32567
 2022-11-08 07:47:47 +05:30
Ernesto Ruiz
637c08d189
fix: add translate function to valitate company msg in chart of accounts importer 2022-11-07 09:22:38 -06:00
Deepesh Garg
e29f756146 chore: Validate for deferred revenue invoices 2022-11-07 16:42:45 +05:30
Deepesh Garg
5fe55176ec chore: Enable no-copy for repost required field 2022-11-07 16:42:12 +05:30
ruthra kumar
9209ec59c2 refactor: split delete gl utility function into two 2022-11-06 11:39:44 +05:30
Deepesh Garg
be0f6b3e6e Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice 2022-11-05 16:35:55 +05:30
Deepesh Garg
0966867c08 chore: Reset repost_required_flag on cancel 2022-11-05 16:35:43 +05:30
Deepesh Garg
cbf82872fb
Merge pull request #32646 from niralisatapara/tds_purchase_invoice 
feat: Item Wise TDS Calculation
 2022-11-04 13:08:10 +05:30
Deepesh Garg
159b511d16
Merge pull request #32809 from monolithon/develop 
feat: Optional Hungarian COA for microenterprises
 2022-11-04 13:00:13 +05:30
rohitwaghchaure
441f082fcb
Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality 
fix: Scan Barcode UX
 2022-11-04 11:04:40 +05:30
Ernesto Ruiz
ad0dd693ac
chore: add translation function to Bank Reconciliation Tool related files 
chore: add translation  function to Bank Reconciliation Tool related files
 2022-11-04 01:06:01 +05:30
Deepesh Garg
e2ad785422 chore: Hide tax withholding net total field 2022-11-04 01:03:20 +05:30
Daizy Modi
010bd9c558 fix: remove cache param 2022-11-03 14:36:48 +05:30
Daizy Modi
27df455b98 perf: use get_cached_value instead of db.get_value in accounts module 2022-11-03 13:38:48 +05:30
niralisatapara
12456f9850 feat: item wise tds calculation 2022-11-03 10:46:30 +05:30
Deepesh Garg
8581b7820d
Merge pull request #32713 from ernestoruiz89/patch-9 
fix: add missing translation function on report related documents
 2022-11-03 09:46:43 +05:30
Rohit Waghchaure
e1f9ba78e5 fix: Scan Barcode UX 2022-11-02 15:37:46 +05:30
niralisatapara
ea387937d0 feat: item wise tds calculation 2022-11-02 12:30:58 +05:30
niralisatapara
2ca0cf6fc4 feat: item wise tds calculation 2022-11-02 12:19:51 +05:30
niralisatapara
4aff2a32ad Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop 2022-11-02 11:21:02 +05:30
Muvuk
579afed460 feat: Optional Hungarian COA for microenterprises #32688 2022-11-01 19:36:42 +01:00
Deepesh Garg
e0a705afe7
Merge pull request #32779 from deepeshgarg007/sales_invoice_default_mop 
fix: Mode of payment for returns in POS Sales Invoice
 2022-11-01 21:28:54 +05:30
Deepesh Garg
62ae329be3
Merge pull request #32801 from deepeshgarg007/purchase_invoice_cancel_amend 
fix: Issues while cancel/amending Purchase Invoice with TDS enabled
 2022-11-01 20:47:55 +05:30
Deepesh Garg
a4f7079270 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_invoice_default_mop 2022-11-01 20:17:43 +05:30
Deepesh Garg
5b74161195 chore: Update tests 2022-11-01 20:17:34 +05:30
Deepesh Garg
f7c9258770 fix: Issues while cancel/amending Purchase Invoice with TDS enabled 2022-11-01 19:54:41 +05:30
Dany Robert
1d83fb20d6
feat(pricing rule): free qty rounding and recursion qty (#32577) 
Option to specify recursion start qty and repeating qty

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-11-01 16:39:32 +05:30
Maharshi Patel
cc6dfd91cf
Merge branch 'develop' into fix-pricing-rule-item-group-uom 2022-11-01 15:06:22 +05:30
Maharshi Patel
935f31eff9 fix: test cases added for item group 2022-11-01 12:55:46 +05:30
Deepesh Garg
5b150abdcb
Merge pull request #32768 from deepeshgarg007/cc_main_allocation 
fix: Budget validation for main cost center
 2022-10-31 22:18:50 +05:30
Deepesh Garg
4e26d42d17 fix: Budget validation for main cost center 2022-10-30 19:33:27 +05:30
Deepesh Garg
49343e9f68 chore: column name 2022-10-28 22:03:09 +05:30
Deepesh Garg
323e45374f
Merge pull request #32620 from rtdany10/psa_pdf_issue 
feat: page break in SoA pdf
 2022-10-28 21:00:01 +05:30
Deepesh Garg
aee4fe9f7b
Merge pull request #32722 from deepeshgarg007/reference_due_date 
fix: Reference due date field type in Journal Entry Accounts table
 2022-10-28 20:55:36 +05:30
Deepesh Garg
50652be6e3 Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice 2022-10-28 20:48:26 +05:30
Deepesh Garg
9ac1c4bc4f
Merge pull request #32699 from deepeshgarg007/general_ledeger_print 
fix: Curreny in SOA print for multi-currency party
 2022-10-28 20:41:49 +05:30
Deepesh Garg
c3275c3f3c
Merge pull request #32692 from deepeshgarg007/opening_invoice_creation_tool_ux 
fix: Clear invoice table post importing invoices
 2022-10-28 20:40:52 +05:30
Deepesh Garg
d9eda45b0b chore: Minor updates 2022-10-28 20:19:13 +05:30
Deepesh Garg
fb41bdd700 Merge branch 'develop' of https://github.com/frappe/erpnext into tds_purchase_invoice 2022-10-28 17:18:11 +05:30
Deepesh Garg
09fa2298ba
Merge pull request #32716 from deepeshgarg007/bank_account_filter 
fix: Company bank account filter in Bank Clearance
 2022-10-28 12:53:53 +05:30
Deepesh Garg
16959c0a8c
Merge pull request #32717 from deepeshgarg007/discount_section_collapse 
fix: Add condition for discount section collapse
 2022-10-28 11:24:25 +05:30
Dany Robert
de20dfe459
chore: remove commented line 2022-10-27 09:33:49 +05:30
Deepesh Garg
a5a73ba857 fix: Filter fixes in Accounts Payable report 2022-10-26 21:18:50 +05:30
Deepesh Garg
e7caa48e2f fix: Reference due date field type in Journal Entry Accounts table 2022-10-26 20:21:36 +05:30
Deepesh Garg
4cd65027c4 fix: Add condition for discount section collapse 2022-10-26 16:48:24 +05:30
Deepesh Garg
f9f78c1086 fix: Company bank account filter in Bank Clearance 2022-10-26 11:02:14 +05:30