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

1664 Commits

Author SHA1 Message Date
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
Ankush Menat
dd24a1b36e
chore: remove obsolete welcome page (#37143) 2023-09-18 16:43:13 +00:00
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
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
Ankush Menat
2dbdc402bb refactor!: remove social media post module 2023-09-14 12:11:23 +05:30
Ankush Menat
2135b0132d refactor!: remove twitter integration 2023-09-14 11:25:49 +05:30
s-aga-r
74272a2e28 fix: patch to delete Woocommerce Settings DocType 2023-09-13 12:02:27 +05:30
Anand Baburajan
4f0bb45a8b
chore: patch to correct asset values if je has workflow [dev] (#36914) 
chore: patch to correct asset values if je has workflow
 2023-09-02 18:31:32 +05:30
Deepesh Garg
283c0a1c0f chore: remove patch 2023-08-30 19:43:32 +05:30
Gursheen Kaur Anand
6a7b45f689
Merge branch 'develop' into view-projects-in-customer-portal 2023-08-18 13:32:08 +05:30
Gursheen Anand
e8f6c286d1 fix: remove portal menu items in pre-model sync patch 2023-08-18 13:21:37 +05:30
ruthra kumar
a0fc68538f refactor: toggle for negative rates in Selling Settings 2023-08-15 07:34:33 +05:30
ruthra kumar
9db8769e65 fix: broken bench update after subscription refactor 2023-08-09 13:54:26 +05:30
Himanshu
38805603db
feat: subscription refactor (#30963) 
* feat: subscription refactor

* fix: linter changes

* chore: linter changes

* chore: linter changes

* chore: Update tests

* chore: Remove commits

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-07 08:33:47 +05:30
ruthra kumar
0587338435 chore: patch to update property setter for Journal Entry Accounts 2023-07-26 22:33:58 +05:30
Deepesh Garg
e1d6bf364e Merge branch 'develop' of https://github.com/frappe/erpnext into customer-details-in-tax-withholding-category-report 2023-07-25 14:45:36 +05:30
Gursheen Anand
5224f13db2 fix: add patch for renaming tds payable report 2023-07-24 17:11:05 +05:30
Marica
1c1e7380e3
Merge branch 'develop' into payments-based-dunning 2023-07-17 12:33:19 +05:30
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
 2023-07-16 12:58:42 +05:30
Ankush Menat
d95559a53c fix: patch for exotel 2023-07-14 17:39:22 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes (#36117) 2023-07-14 10:28:36 +05:30
barredterra
e686bb0739 Merge remote-tracking branch 'upstream/develop' into payments-based-dunning 2023-07-03 19:56:42 +02:00
Anand Baburajan
dedb5e23f7
fix: delete loan module workspace properly after separation (#35971) 
* fix: delete loan module workspace properly after separation

* chore: run remove_loan_management_module patch again
 2023-07-03 13:06:46 +05:30
Marica
0a67a3a9c4
Merge branch 'develop' into payments-based-dunning 2023-06-30 13:32:50 +05:30
Anand Baburajan
988d755906
refactor!: removing loan management module (#35522) 
* chore: resolving conflicts

* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance

* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation

* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance

* refactor: remove loan tests from test_bank_transaction

* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary

* refactor: removed test_bank_reconciliation_statement

* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement

* refactor: add missing hook and patches for module removal and deprecation warning

* refactor: remove loan management translations

* chore: add erpnext tests dependent on lending
 2023-06-30 11:02:49 +05:30
Marica
0498a31c42
Merge branch 'develop' into payments-based-dunning 2023-06-28 16:48:22 +05:30
Gursheen Kaur Anand
5113a417a1
fix!: UX of supplier linking with supplier users on portal pages (#35836) 
* fix: create and add Portal Users child table in Supplier/Customer

Issue #35772

* fix: modify the original permission check hook

* fix: auto-add role for portal users

* fix: added patch for auto-populating portal users

* fix: modify patch to fetch users correctly

* fix: remove unnecessary code for updating naming_series

* fix(UX): show portal user in list view

Also split columns to reduce whitespace.

* refactor: simpler role checking

* fix: consider parenttype while fetching portal user

* refactor: simpler code, rename variable

* test: supplier portal user can access their docs

* refactor: only add role if not added

* refactor: rename and move patch to supplier

* refactor: dont add role if no perm or existing doc

* fix: add role before save

* refactor: run query directly

* refactor: split patch and apply roles

- if role isn't present dont add portal user
- ignore failure as it's not critical

* test: fix permission creation for webform test

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-06-28 11:22:40 +05:30
Gursheen Anand
555c126eb9 fix: add patch for setting default value of report field 2023-06-23 10:52:25 +05:30
barredterra
0990011e74 feat: add patch for dunning 2023-06-14 13:07:47 +05:30
Deepesh Garg
abc6fe0b06
refactor!: Remove custom cashflow report mapper (#35523) 
* refactor: Remove custom cashflow mapper

* chore: patch to delete docs

* fix: Cleanup defaults during install

* fix: Remove custom cashflow mapper from consolidated financial statement
 2023-06-02 17:48:59 +05:30
Nabin Hait
0b28f641ad fix: Delete Retail and Utilities worspaces amd hide default Settings and Integration workspaces 2023-05-30 13:18:52 +05:30
Sagar Sharma
196e18187f fix(patch): add patch to set packed_qty in draft DN 2023-05-25 18:03:39 +05:30
Nabin Hait
2b8c39eee9 fix: account closing balance patch 2023-05-17 22:05:46 +05:30
Nabin Hait
f5cc41e182 fix: account closing balance patch 2023-05-10 16:41:47 +05:30
Nabin Hait
713fa67b96 fix: account closing balance patch 2023-05-05 17:54:34 +05:30
Deepesh Garg
b545e3def0
fix: Add company field to lower deduction certificate (#34914) 2023-04-25 19:07:45 +05:30
ruthra kumar
3f537d30bd chore(patch): by default ledger entries of JE's will not be merged 2023-04-18 10:55:49 +05:30
Komal-Saraf0609
ad11934d39
fix: enabling lead even after "Opportunity" created against it (#34627) 
* fix: enabling lead even after "Opportunity" created against it

* chore: Linting Issues

---------

Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-30 08:03:55 +05:30
Deepesh Garg
fa991b2dcf Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-21 17:00:08 +05:30
Richard Case
d8e73b63f3
fix: remove non-maintained Tax Detail report and missing workspace links (#34192) 
* fix: remove non-maintained Tax Detail report and missing workspace links

* patch: delete report "Tax Detail"

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-21 16:23:27 +05:30
Deepesh Garg
d11a64ddcb Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-17 16:50:49 +05:30
Deepesh Garg
be723bb9d4
chore: Update user manual link (#34478) 2023-03-17 15:39:33 +05:30
Deepesh Garg
91f7b0bbd6 Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-13 20:52:48 +05:30
Anand Baburajan
097be8bdea
Merge branch 'develop' into patch_assdeprsch_gpa_ndb 2023-03-13 15:08:08 +05:30
ruthra kumar
9d0a1149d8 chore: remove remarks migrations patch from patches.txt 
'Remarks' field is moved in migrate_gl_to_payment_ledger patch itself
from versions highers than v14.18.2. Removing it from patches.txt
 2023-03-11 13:17:52 +05:30
anandbaburajan
ebb6953274 fix: add missing patch for new fields added in #34214 2023-03-09 17:55:27 +05:30
Deepesh Garg
719ac5c8f3 Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-08 18:35:26 +05:30
Deepesh Garg
4a2046dfb6 fix: Aggregation with previous closing balance 2023-03-05 18:18:33 +05:30
Deepesh Garg
c089c4156c chore: Minor fixes 2023-03-02 16:46:56 +05:30
Deepesh Garg
95c9aafda9 fix: Update patch to generate closing balance entries 2023-03-01 14:45:22 +05:30