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

9279 Commits

Author SHA1 Message Date
Deepesh Garg
6750af90f7
Merge pull request #37562 from GursheenK/subscription-tax-filters 
fix(minor): filter tax template based on company in subscription
 2023-10-18 17:49:09 +05:30
rohitwaghchaure
2851a41310
fix: Issues related to RFQ and Supplier Quotation on Portal (#37565) 
fix: RFQ and Supplier Quotation for Portal
 2023-10-18 16:31:35 +05:30
Gursheen Anand
1a2f659de2 fix: filter tax template based on company 2023-10-18 11:42:19 +05:30
Ankush Menat
1d186efaab
Merge pull request #37554 from frappe/e_com_perms 
fix: e-commerce permissions for address
 2023-10-18 11:08:16 +05:30
ruthra kumar
2bcda494b2
Merge pull request #37549 from ruthra-kumar/use_account_in_key_for_ar_ap_reports 
refactor: use account in key while grouping voucher in ar/ap report
 2023-10-18 09:09:16 +05:30
Ankush Menat
c197d37404 Merge branch 'develop' into e_com_perms 2023-10-17 22:29:44 +05:30
Ankush Menat
f4d74990fe fix: E-commerce permissions 2023-10-17 22:28:04 +05:30
ruthra kumar
244cec64b2 test: report output if party is missing 2023-10-17 20:40:50 +05:30
Deepesh Garg
88be7ada33 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_order_item_dimensions 2023-10-17 18:30:49 +05:30
Deepesh Garg
e31db18912 chore: Add accounting dimensions to Sales Order Item table 2023-10-17 18:19:47 +05:30
ruthra kumar
601ab4567e refactor: use account in key while grouping voucher in ar/ap report 2023-10-17 17:48:04 +05:30
Sabu Siyad
f900a78995
refactor!: drop ecommerce in favor of webshop (#33265) 
* refactor!: remove ecommerce item group field check

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `e_commerce` directory

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `get_context` from `item_group`

https://frappeframework.com/docs/v14/user/en/guides/portal-development/context

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove related `./templates`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(navbar): remove wishlist (ecommerce)

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(js): remove js from scripts

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `www/all-products`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages and js

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove js/customer_reviews

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(portal utils): remove shopping cart debtor account

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove e_commerce events from hooks

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(web): remove e_commerce js from bundle

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(setup): remove shopping cart setup

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(item): remove website item button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(payment request): remove `on_payment_authorized`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: @staticmethod `get_gateway_details`

to avoid monkey patching, in custom apps
https://discuss.erpnext.com/t/how-to-override-method-in-frappe/28786/36

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(pages): remove product page

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): do not setup website items

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(workspace): remove link to ecommerce settings

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(www): remove shop-by-category

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): remove featured product

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products in homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(homepage): remove explore button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products fields from homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* Revert "refactor!: @staticmethod `get_gateway_details`"

This reverts commit 561bcd96680a930bb92627869502d9346b10611b.

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove payment gateway e_commerce import

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: pass `party` into `get_price`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: move `get_item_codes_by_attributes` to `utilities/product`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(quotation): input customer group

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

* refactor: remove custom `navbar_items.html`

* refactor!(item): remove `published_in_website`

* refactor: move `validate_duplicate_website_item` before rename

* test: remove `test_shopping_cart_without_website_item`

* chore: add doctype drop patch

* refactor: removed website item related code

* refactor: removed shopping_cart code

* refactor: removed e-commerce related patches

* refactor: removed website related fields from item group

* fix: patch create_asset_depreciation_schedules_from_assets, KeyError: '0K BU64 AUY'

---------

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-10-17 17:05:44 +05:30
ruthra kumar
5bb3e290d2
Merge pull request #37330 from ruthra-kumar/provision_to_pick_exc_rate_on_transaction_date 
refactor: checkbox to toggle exchange rate inheritence in PO->PI
 2023-10-17 09:45:33 +05:30
ruthra kumar
08315522bb refactor: checkbox to toggle exchange rate inheritence in PO->PI 2023-10-16 16:25:19 +05:30
Deepesh Garg
621da178e1 Merge branch 'develop' of https://github.com/frappe/erpnext into rounded-row-wise-tax 2023-10-15 18:10:27 +05:30
ruthra kumar
dd099be690
Merge pull request #37478 from ruthra-kumar/tds_from_journals 
refactor: back calculate total amt for TDS
 2023-10-15 10:51:42 +05:30
ruthra kumar
fbabf4ac2e refactor(test): make sure TDS Payable is available for testing 2023-10-15 08:57:38 +05:30
ruthra kumar
0207d6e7c9 refactor(test): make use of @change_settings in PI test cases 2023-10-15 08:57:38 +05:30
ruthra kumar
a2e064d214 refactor(test): use test fixture in purchase invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
3bdf4f628c refactor(test): use test fixture in subscription 2023-10-15 08:57:38 +05:30
ruthra kumar
de9baef84a refactor(test): use @change_settings to fix failing test cases 2023-10-15 08:57:38 +05:30
ruthra kumar
8ebe5733ac refactor(test): fix broken test cases in Sales Invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
58065f31b1 refactor(test): use @change_settings in sales invoice 2023-10-15 08:57:38 +05:30
ruthra kumar
fc50b174eb refactor(test): unset accounts frozen date 2023-10-15 08:57:38 +05:30
ruthra kumar
c322e5f381 test: use fixtures for sales and purchase invoice 2023-10-15 08:57:38 +05:30
s-aga-r
afef9dc8df
Merge pull request #37182 from s-aga-r/MOVE-PAYMENTS-GATEWAYS 
refactor!: move payment gateways to the payments app
 2023-10-14 16:48:11 +05:30
ruthra kumar
f4a294c5ce
Merge pull request #37495 from ruthra-kumar/keyerror_on_comparison_report 
fix: keyerror on gl and pl comparision report
 2023-10-14 12:15:19 +05:30
ruthra kumar
8ca0e4eacc
Merge pull request #37435 from rtdany10/sp-gp-fix 
fix(gp): wrong `allocated_amount` when grouped by Sales Person
 2023-10-14 12:12:14 +05:30
ruthra kumar
ad00df0af6 fix: keyerror on gl and pl comparision report 2023-10-13 15:39:54 +05:30
ruthra kumar
479fe915af
Merge pull request #37484 from ruthra-kumar/ignore_links_on_closing_balance_patch 
refactor(patch): ignore links on closing balance patch
 2023-10-13 09:18:41 +05:30
ruthra kumar
17ca8756a7 refactor(patch): ignore links on closing balance patch 2023-10-12 20:43:15 +05:30
ruthra kumar
2c56ee97c7 refactor: back calculate total amt for TDS 2023-10-12 16:03:26 +05:30
ruthra kumar
c1782c5015 refactor: for non-repost fields, don't validate 2023-10-11 13:30:21 +05:30
Dany Robert
6a27cbd61d
Merge branch 'frappe:develop' into rounded-row-wise-tax 2023-10-11 12:31:13 +05:30
Dany Robert
bda82bf1e9 fix(gp): wrong allocated_amount on multi sales person invoice 2023-10-10 10:30:09 +00:00
ruthra kumar
b495e5a5a1
Merge pull request #37393 from ruthra-kumar/import_financial_statements_in_bundle 
refactor: import 'financial_statements.js' in erpnext bundle
 2023-10-10 11:58:40 +05:30
ruthra kumar
db317d67d5
Merge pull request #37204 from GursheenK/pe-allocation-for-term-inv 
fix: allocate payment amount for split invoices in PE
 2023-10-10 10:11:24 +05:30
ruthra kumar
3d99e5757e
Merge pull request #37123 from blaggacao/fix/payment-request-rounding 
fix: payment request rounding in multi-currency and on status update
 2023-10-10 10:07:25 +05:30
Bernd Oliver Sünderhauf
2d6f1f8598
fix(UX): Un-require description fields on items (#37354) 
fix(UX): Un-require description fields on items.
 2023-10-10 07:26:37 +05:30
Anand Baburajan
6959c928c6
test: add product_code in create_loan_product (#37416) 2023-10-09 20:58:56 +05:30
RitvikSardana
2c899dd13a
fix: customer group and territory not mandatory (#37050) 
* fix: customer group and territory not mandatory

* fix: supplier group not required

* test: added test case for customer and supplier without group

* test: Customer without customer group and territory

* chore: remove unwanted changes

* test: Supplier without supplier group

* test: code cleanup

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-10-09 20:21:25 +05:30
ruthra kumar
411be583a3
Merge pull request #37395 from ruthra-kumar/exception_on_exporting_errored_rows_in_bank_statement_import 
fix: exception on exporting errored rows
 2023-10-08 18:20:30 +05:30
ruthra kumar
d3c6000904 fix: exception on exporting errored rows 2023-10-08 13:16:28 +05:30
ruthra kumar
40e7c43ce3 refactor: import financial_statement in erpnext bundle 2023-10-07 21:03:31 +05:30
ruthra kumar
7d11fe1633
Merge pull request #37289 from GursheenK/ar-ageing-summary 
fix: ageing summary in SOA AR
 2023-10-07 15:09:21 +05:30
ruthra kumar
c006c14aaa
Merge pull request #37359 from ruthra-kumar/change_request_response_strucutre_on_exchangerate 
refactor: add `access_key` field to facilitate use of exchangerate.host provider
 2023-10-05 09:18:56 +05:30
ruthra kumar
9396fb77f4
Merge pull request #37294 from ruthra-kumar/restrict_payment_as_ref_in_je_from_ui 
refactor: block Payment Entry as ref in Journals from UI
 2023-10-05 08:53:35 +05:30
ruthra kumar
81591a34c2 refactor: introduce access_key field 2023-10-05 08:43:08 +05:30
mergify[bot]
f4f40cc776
feat: composite WIP asset (copy #37352) (#37353) 
* feat: wip composite asset

(cherry picked from commit 4907e7acd4ff549f34f6c9d0144af83db0ad9cc1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolving conflicts

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-10-04 10:29:18 +05:30
ruthra kumar
ab378196bd
Merge pull request #37304 from GursheenK/party-totals-payable-report 
fix: only float row values for total in AP summary
 2023-10-03 19:45:03 +05:30