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

46505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
e6199dc802
fix: allow to select parent warehouse in the website item (#37047) 2023-09-20 17:27:35 +05:30
Ankush Menat
bf01f3227f chore: remove import script 
Unused
 2023-09-20 16:22:49 +05:30
Smit Vora
3e282bfbce
chore: add regional support for getting payment entries (#37119) 
chore: add regional support for get payment entries
 2023-09-19 20:47:21 +05:30
RJPvT
c35dea7177
chore: translations dutch (#37042) 
update: translations dutch
 2023-09-19 20:26:42 +05:30
Raffael Meyer
57d5c8a837
fix: update help links (#37098) 2023-09-19 19:59:16 +05:30
Raffael Meyer
84a9000db2
fix: german translation of Sales and Purchase Invoice (#37122) 
* fix: german translation of Purchase Invoice

* fix: german translation of Sales Invoice
 2023-09-19 19:57:43 +05:30
NandhiniDevi
6be567dbf6
fix: add item group filter added in item-wise purchase register (#36937) 
fix: add item group filter added in item-wise purchase register (#36937)
 2023-09-19 19:25:46 +05:30
NIYAZ RAZAK
141ba255e0
feat: validate duplicate date in holiday list (#37022) 
* feat: validate duplicate date in table

* chore: cleanup

* chore: linting issues

* chore: linting issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-19 18:50:47 +05:30
Deepesh Garg
e19e04b050
feat: Add a process document for Subscription (#37126) 
* feat: Add a process document for Subscription

* chore: Remove print statements

* feat: Input for generating invoice before currenc invoice date

* chore: patch for backward compatability

* refactor: Unit tests for subscription

* chore: set status on insert
 2023-09-19 18:39:44 +05:30
RitvikSardana
03f0abf6de
fix: after applying coupon code, field in_words not updated (#37133) 
* fix: after applying coupon code, field in_words not updated

* fix: changed the order of the function set_total_in_words
 2023-09-19 13:08:17 +05:30
s-aga-r
9c9d0ecb73
feat: provision to create RIV from Stock Ledger Invariant Check report (#37115) 
* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`
 2023-09-19 13:00:44 +05:30
mergify[bot]
195de14810
fix: don't set from warehouse for purchase material request (backport #37132) (#37134) 
fix: don't set from warehouse for purchase material request (#37132)

(cherry picked from commit e62b783f340844783352030de422c6be14b3ddfc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-18 22:31:22 +05:30
Ankush Menat
dd24a1b36e
chore: remove obsolete welcome page (#37143) 2023-09-18 16:43:13 +00:00
Ankush Menat
d0eac47483 fix: stock summary page 2023-09-18 21:49:52 +05:30
ruthra kumar
2a575d9dc2
Merge pull request #37131 from ruthra-kumar/more_generic_customer_filter_in_ar_report 
refactor: more generic filters in Accounts Receivable report
 2023-09-18 16:59:25 +05:30
ruthra kumar
08d91ab831 refactor(test): AR output filtered on USD customers 2023-09-18 16:28:06 +05:30
ruthra kumar
083c82c206 chore: remove stale code 2023-09-18 16:28:06 +05:30
ruthra kumar
ac650d2e7a refactor: replace 'customer' filter with 'party_type' and 'party' 2023-09-18 16:28:02 +05:30
ruthra kumar
5acbf3f262
Merge pull request #37127 from ruthra-kumar/better_date_filters_in_get_outstanding_invoices 
refactor: better date filters in `Get Outstanding Invoices` dialog
 2023-09-18 13:20:32 +05:30
RitvikSardana
3764c01028
fix: accounting dimensions required while creating POS Profile (#36668) 
* fix: accounting dimensions required while creating POS Porfile

* fix: accounting dimensions fetched while closing POS

* chore: code cleanup

* fix: ad set in final consolidated invoice

* chore: code cleanup

* chore: code cleanup

* fix: accounting dimension validation from backend

* chore: code cleanup

* chore: code cleanup

* chore: code cleanup

* fix: added edge case when acc dimension is created after creating pos profile

* test: added test case for Pos Closing For Required Accounting Dimension In Pos Profile

* test: fixed the test case

* test: fixing test case

* fix: changed test case location

* test: fixing test case

* test: fixing test case

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
 2023-09-18 13:07:14 +05:30
ruthra kumar
9004721859 refactor: better date filters in Get Outstanding Invoices dialog 2023-09-18 12:46:08 +05:30
Deepesh Garg
5e21e7cd1d
fix: Don't allow merging accounts with different currency (#37074) 
* fix: Don't allow merging accounts with different currency

* test: Update conflicting values

* test: Update conflicting values
 2023-09-17 15:54:06 +05:30
ruthra kumar
21f94918a3
Merge pull request #36893 from marination/bank-reco-code-cleanup 
refactor: Bank Reconciliation Tool APIs
 2023-09-17 08:07:30 +05:30
Gursheen Kaur Anand
099468e3cf
fix: company wise deferred accounting fields in item (#37023) 
* fix: move deferred accounts in accounting section

* fix: move deferred check boxes in item accounting

* fix: show company wise acc in filters

* fix: fetch item deferred account from child table

* fix: tests using deferred acc

* refactor: use cached value

* fix: cached value call

* feat: patch to migrate deferred acc

* fix: hardcode education module doctypes in patch

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-16 21:25:31 +05:30
HENRY Florian
34bb64e41a
fix(ux): move get_route_options_for_new_doc to refresh (#37096) 
fix: move `get_route_options_for_new_doc` to `refresh`
 2023-09-16 15:59:09 +05:30
s-aga-r
fc016680c9
fix: ignore user permissions for Source Warehouse in MR (#37102) 
fix: ignore user permissions for Source Warehouse in MR
 2023-09-15 21:45:43 +05:30
Ankush Menat
7045810bae refactor: move clear data button to user action 2023-09-15 20:47:28 +05:30
ruthra kumar
a093dff039
Merge pull request #37108 from ruthra-kumar/better_asset_validation_on_returns 
fix: asset validation misfire on debit notes
 2023-09-15 20:01:34 +05:30
ruthra kumar
097b9892dc fix: asset validation misfire on debit notes 2023-09-15 17:54:20 +05:30
ruthra kumar
855a0d3bec
Merge pull request #37105 from ruthra-kumar/move_unreconcile_btn_to_group 
refactor: move `unreconcile` button into a drop down
 2023-09-15 16:57:32 +05:30
Ankush Menat
61778d5058
ci: restart bench before final migrate (#37104) 
Also remove few patches which are now handled automatically
 2023-09-15 16:51:56 +05:30
ruthra kumar
94ce43b0d5 refactor: add unreconcile btn to purchase invoice 2023-09-15 16:21:50 +05:30
ruthra kumar
f2b0ac6868 refactor: move unreconcile btn inside a drop down 2023-09-15 16:19:27 +05:30
ruthra kumar
2be025311a test: bank reconciliation API methods 2023-09-15 14:44:07 +05:30
mergify[bot]
08aaf22b2a
fix: precision issue and column name (backport #37073) (#37089) 
fix: precision issue and column name (#37073)

(cherry picked from commit f2395a92971f48904e88afb929285def7ba221e4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-15 12:09:48 +05:30
Ankush Menat
2f7b3bbfad
ci: fix patch test (#37079) 
* ci: fix patch test

* ci: use v13 DB as starting point for patch

* ci: remove payments from patch test

* ci: print bench logs after tests

* ci: restart bench on each update

* ci: patch test v13db > v14 > develop

and when v15 is out v13db > v14 > v15 > develop
 2023-09-14 14:46:45 +05:30
ruthra kumar
85ebaa3aed
Merge pull request #36879 from ruthra-kumar/unreconcile_feature 
feat: Unreconcile Payments
 2023-09-14 12:17:46 +05:30
Ankush Menat
4940edc386
Merge pull request #37087 from frappe/remove_social_media_post_module 
refactor!: remove social media post module
 2023-09-14 12:16:57 +05:30
Ankush Menat
2dbdc402bb refactor!: remove social media post module 2023-09-14 12:11:23 +05:30
Gursheen Kaur Anand
5976d0d13f
fix: prorate factor in subscription invoice total (#36880) 
fix: prorate factor calculation
 2023-09-14 12:05:05 +05:30
Ankush Menat
0fadde037a
Merge pull request #37086 from frappe/remove_twitter 
refactor!: remove twitter integration
 2023-09-14 11:49:03 +05:30
Ankush Menat
2135b0132d refactor!: remove twitter integration 2023-09-14 11:25:49 +05:30
s-aga-r
41fb40e26f
Merge pull request #37015 from s-aga-r/REMOVE-WOOCOMMERCE 
refactor!: remove `woocommerce` integration
 2023-09-14 10:41:18 +05:30
Abdo
6f4f5be990
chore: Translate Voucher Type in General Ledger Report (#36874) 
chore: Translate Voucher Type in  General Ledger Report
 2023-09-13 20:38:45 +05:30
ViralKansodiya
96363dbb07
fix: Remove redundant code (#37001) 
fix: Remove redundant code
 2023-09-13 20:34:20 +05:30
Deepesh Garg
7711744020
Merge pull request #37032 from HarryPaulo/auth-rule-based-on-item-group 
feat: created "based on" Item Group to specify a different percentage…
 2023-09-13 20:27:34 +05:30
Deepesh Garg
1db05c80e1
Merge pull request #37031 from HarryPaulo/fix-auth-rule-based-on 
fix: "Based on" field always has the value "Not applicable"
 2023-09-13 20:26:28 +05:30
Deepesh Garg
6664bc98a0
Merge pull request #37041 from vorasmit/fix-advances 
fix: multiple fixes for booking advances in seperate account
 2023-09-13 20:24:57 +05:30
s-aga-r
78905e35f2
Merge pull request #36973 from s-aga-r/FIX-967 
fix: accepted warehouse and rejected warehouse can't be same
 2023-09-13 16:30:21 +05:30
s-aga-r
d2f3286115 fix: ignore user permissions for From Warehouse in PR 2023-09-13 16:26:29 +05:30