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

46582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
marination
8a4954d713 test: Impact on SO of advance PE submit and unlinking/replacement by SI 2023-09-13 19:09:03 +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
Deepesh Garg
7bfd487b25
Merge pull request #36364 from SvbZ3r0/develop 
fix: Naming Series preview when no previous transaction present
 2023-09-13 15:17:51 +05:30
Deepesh Garg
1d014122c1
Merge pull request #36980 from anandbaburajan/SI_DI_internal_and_external_links 
fix: + btn not appearing for delivery note connection
 2023-09-13 15:16:11 +05:30
marination
426350eee6 fix: Update advance_paid in SO/PO after unlinking from advance entry 2023-09-13 14:24:56 +05:30
s-aga-r
b83d880d66
Merge pull request #37046 from s-aga-r/FIX-1081 
fix: Purchase Receipt Provisional Accounting GL Entries
 2023-09-13 14:21:59 +05:30
rohitwaghchaure
0e83190c19
fix: incorrect stock ledger entries in DN (#36944) 2023-09-13 13:34:40 +05:30
s-aga-r
1c78a5a9aa test: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 12:28:18 +05:30
s-aga-r
74272a2e28 fix: patch to delete Woocommerce Settings DocType 2023-09-13 12:02:27 +05:30
s-aga-r
328ba4b656 refactor!: remove woocommerce 2023-09-13 11:50:04 +05:30
s-aga-r
6bab0eeaa1 fix: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 11:24:10 +05:30
rohitwaghchaure
e6c302a397
fix: test case (#37063) 2023-09-13 11:22:43 +05:30
Deepesh Garg
88f7e57edf
Merge pull request #37055 from deepeshgarg007/dimension_filters_gl 
fix: Apply dimension filter, irrespective of dimension columns
 2023-09-13 10:05:58 +05:30
ruthra kumar
5898a6f48e
Merge pull request #37057 from ruthra-kumar/packed_item_picking_expired_price 
fix: Packed item incorrectly picks expired price on Sales Order
 2023-09-13 08:18:47 +05:30
ruthra kumar
055156d28a test: expired item price should not be picked 2023-09-13 07:48:59 +05:30
ruthra kumar
47ffa4983c fix: packed item using expired price 2023-09-13 06:03:12 +05:30
Deepesh Garg
1f02fb3bd9
Merge pull request #37017 from anandbaburajan/company_tabs 
chore: add tabs for company doctype
 2023-09-12 22:41:23 +05:30
Deepesh Garg
769db0b3bc fix: Apply dimension filter, irrespective of dimesion columns 2023-09-12 21:14:08 +05:30
HarryPaulo
da54ab5b3d fix: linters 2023-09-12 09:43:11 -03:00
rohitwaghchaure
9a23ba53c5
fix: button to make BOMs (#37049) 
fix: custom button to make BOMs
 2023-09-12 17:19:12 +05:30
mergify[bot]
93af6f6a1b
feat: provision to set required by from Production Plan (backport #37039) (#37040) 
feat: provision to set required by from Production Plan (#37039)

* feat: provision to set the Required By date from production plan

* test: added test case for validate schedule_date

(cherry picked from commit d278b116030df0f272c3c101b75fe3b66a344c04)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-12 16:29:02 +05:30
Smit Vora
c09807845f fix: ensure correct preview and set latest transaction date 2023-09-12 13:25:51 +05:30
s-aga-r
3c6e527dd1
Merge pull request #37025 from s-aga-r/FIX-883 
fix: `Parent Task` link with `Project Task`
 2023-09-12 06:59:45 +05:30
HarryPaulo
623239d3f7 feat: created "based on" Item Group to specify a different percentage for each item group 2023-09-11 18:14:38 -03:00
HarryPaulo
fae640c56f fix: "Based on" field always has the value "Not applicable" 2023-09-11 17:57:31 -03:00
marination
2ad62be2c7 chore: Convert db.sql to QB queries 2023-09-12 00:00:06 +05:30