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

2520 Commits

Author SHA1 Message Date
Dany Robert
50d56db0c2
fix: specify precision for net_amount (#39481) 
* fix: specify precision for net_amount

* fix: correct existing test to account for precision

* fix: rounding issue in test cases

* fix: optional grand total manipulation

* fix: use `grand_total_diff` for manipulation

* fix: patch to set default for grand total manipulation

* fix: wrong rounding assertion for USD

* fix: undefined this.frm error

* chore: linters

* fix: `net_amount` percision and method rename

* fix: missing frm reference

* chore: minor cleanups and depr message

* refactor: remove optional adjusting of grand total
 2024-01-29 09:32:44 +05:30
Deepesh Garg
16404110a8
Merge pull request #39588 from CitrusLeafSoft/New-Financial-report-views 
feat: New financial views - Growth and margin views for P&L and balance sheet
 2024-01-28 11:36:55 +05:30
Gursheen Anand
2486b646a1 fix: check page obj before adding menu 2024-01-27 23:30:17 +05:30
nitmit
92649de5c6 Adding growth and margin views for P&L and balance sheet financial reports in collaboration with Sapcon Instruments Pvt Ltd 2024-01-27 10:18:35 +05:30
Deepesh Garg
d2057588dd Merge branch 'develop' of https://github.com/frappe/erpnext into type-error-in-transaction-js 2024-01-26 09:29:05 +05:30
Rohit Waghchaure
64cb1153de fix: incorrect active serial nos 2024-01-24 15:15:50 +05:30
Gursheen Anand
030d35628d fix: type error on company doc 2024-01-24 12:47:55 +05:30
ruthra kumar
ebaa5d3add
Merge pull request #39054 from ruthra-kumar/provision_to_set_dimension_in_reconciliation_tool 
refactor: provision to filter on dimensions in reconciliation tool
 2024-01-23 17:28:21 +05:30
rohitwaghchaure
f8675817e2
Merge pull request #39478 from rohitwaghchaure/fixed-ux-improvement-for-SABB 
fix: UX improvements for Serial and Batch Bundle
 2024-01-23 11:57:03 +05:30
ruthra kumar
52814724eb refactor: move 'project' set_query to sales_common.js 2024-01-22 15:32:16 +05:30
Rohit Waghchaure
fc0d2aeeff fix: auto create serial no on scan 2024-01-22 13:42:33 +05:30
ruthra kumar
f8bbb0619c refactor: dynamic dimension filters in pop up 2024-01-22 10:43:09 +05:30
Rohit Waghchaure
5d94f0bde5 fix: UX improvements for Serial and Batch Bundle 2024-01-21 20:46:57 +05:30
ruthra kumar
60b26ad8b2 fix: possible typerror in utils.js 
and remove unwanted debugging statements
 2024-01-15 20:37:21 +05:30
Deepesh Garg
a87bb21246
Merge pull request #39084 from deepeshgarg007/pricing_rule_remove 
fix: Pricing rule application/removal on qty change
 2024-01-13 12:47:19 +05:30
ruthra kumar
9f27ac142b fix: possible typeerror on transaction.js 2024-01-10 11:34:28 +05:30
ruthra kumar
9ba6ff67d5 fix: project filters on Delivery Note and Sales Order 2024-01-08 17:11:26 +05:30
rohitwaghchaure
f09e2130a1
fix: serial / batch barcode scanner (#39114) 2024-01-04 14:58:02 +05:30
ruthra kumar
7da9ffa3bd fix: typerror on multi select dialog 2024-01-03 17:59:15 +05:30
Deepesh Garg
f52d7c7665 fix: Pricing rule application/removal on qty change 2024-01-02 13:37:39 +05:30
rohitwaghchaure
b5340c5ec0
fix: auto fetch not working if bundle exists (#39002) 2023-12-28 18:32:27 +05:30
rohitwaghchaure
a117ef3cb8
fix: not able to cancel sales invoice (#38979) 2023-12-28 11:14:27 +05:30
Deepesh Garg
9b1c22250f
feat: Merge taxes from mapped docs (#38346) 
* feat: Merge taxes from mapped docs

* chore: ci failures
 2023-12-27 22:37:01 +05:30
rohitwaghchaure
47ee801d37
fix: incorrect qty in serial batch bundle against pick list (#38964) 2023-12-27 13:09:23 +05:30
rohitwaghchaure
161ae1edd1
fix: reset the incoming rate on changing of the warehouse (#38925) 2023-12-22 17:37:17 +05:30
rohitwaghchaure
0743289925
fix: serial and batch bundle return not working (#38754) 
* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no
 2023-12-17 12:42:07 +05:30
Ankush Menat
eaf86a6461
fix: timezone aware SLA banner (#38745) 2023-12-14 15:53:57 +05:30
Ankush Menat
6851c5042f
Revert "fix(ux): don't update qty blindly" (#38728) 2023-12-13 23:14:20 +05:30
rohitwaghchaure
13cba5068b
fix: barcode scanning for the stock entry (#38716) 2023-12-13 15:08:16 +05:30
rohitwaghchaure
b562b4cf99
fix: show stock qty in popup (#38698) 2023-12-12 16:41:10 +05:30
ruthra kumar
fa2d33cb50
fix: typeerror on new sites (#38692) 2023-12-12 15:43:39 +05:30
s-aga-r
8ddc26eb2e
Merge pull request #38634 from creative-paramu/shipping_address_link 
fix: Shipping Address Link Showing in Buying
 2023-12-08 18:59:26 +05:30
creative-paramu
ca0c3eb184 fix(ux): Shipping Address Link 2023-12-08 18:57:31 +05:30
s-aga-r
a045916aca
Merge pull request #38608 from s-aga-r/FIX-6766 
fix(ux): don't update qty blindly
 2023-12-08 16:30:42 +05:30
Shariq Ansari
08ed3cd313 fix: format only if searched text contain link value text 2023-12-07 19:39:24 +05:30
s-aga-r
0156339f34 fix(ux): don't update qty blindly 2023-12-07 10:16:46 +05:30
rohitwaghchaure
c8693cdf37
fix: scan for serial or batch in bundle (#38534) 2023-12-04 15:02:47 +05:30
Sagar Vora
b6a7549407
fix: use predefined onload property load_after_mapping (#38209) 2023-12-02 20:06:19 +05:30
Deepesh Garg
85f9f8d176
Merge pull request #38250 from GursheenK/unset-discount-amount-based-on-coupon-code 
fix: unset discount amount based on coupon code
 2023-11-29 15:53:46 +05:30
Patrick Eissler
8e4b591ea2
fix: make create button translatable (#38165) 
* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-29 10:22:47 +05:30
Smit Vora
b206b0583b fix: fetch item_tax_template values if fields with fetch_from exisit 2023-11-23 15:10:47 +05:30
ruthra kumar
74f9e34182 chore: update new unreconcile doctype name in JS and PY files 2023-11-22 05:59:20 +05:30
Gursheen Anand
6518582ed3 fix: unset discount amount based on coupon code 2023-11-21 15:14:55 +05:30
Dany Robert
3a487bd33a fix: wrong round off and rounded total 2023-11-18 13:32:04 +00:00
ruthra kumar
c31ee8ea33 refactor: use 'boolean' parameter while fetching FY year 2023-11-14 07:25:10 +05:30
hyaray
59438ee8d4
chore: Add missing translations (#38043) 
chore: Add missing translations
 2023-11-11 19:38:24 +05:30
Vishakh Desai
c2bda2c705
fix: Supplier Quotation fields (#37963) 2023-11-09 18:26:34 +05:30
Bernd Oliver Sünderhauf
f276fbba4f refactor: remove extraneous disabled filters 2023-10-28 02:10:28 +02:00
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
Ankush Menat
2790ae0744 fix: Update frappe.link_search usage 
refer https://github.com/frappe/frappe/pull/22745
 2023-10-16 15:43:14 +05:30