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

2731 Commits

Author SHA1 Message Date
mergify[bot]
2db1e1a737
fix: serial / batch barcode scanner (backport #39114) (#39143) 
fix: serial / batch barcode scanner (#39114)

(cherry picked from commit f09e2130a1a3ca999247f89f76c20efcc003b450)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-04 16:02:29 +05:30
ruthra kumar
54a0df5164 fix: typerror on multi select dialog 
(cherry picked from commit 7da9ffa3bd072fbfc9627e6eb5afb3dd3078f560)
 2024-01-03 15:25:24 +00:00
mergify[bot]
2e919344df
fix: auto fetch not working if bundle exists (backport #39002) (#39004) 
fix: auto fetch not working if bundle exists (#39002)

(cherry picked from commit b5340c5ec0d418dcf764efa961f743f88b660a24)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-28 18:54:38 +05:30
mergify[bot]
f8625f3eb7
fix: not able to cancel sales invoice (backport #38979) (#38980) 
fix: not able to cancel sales invoice (#38979)

(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-28 11:21:51 +05:30
mergify[bot]
4e2304818b
feat: Merge taxes from mapped docs (#38346) 
feat: Merge taxes from mapped docs (#38346)

* feat: Merge taxes from mapped docs

* chore: ci failures

(cherry picked from commit 9b1c22250f1da37a563ba0885fbbd732b176816c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-28 08:28:02 +05:30
mergify[bot]
5874be0f79
fix: incorrect qty in serial batch bundle against pick list (backport #38964) (#38966) 
fix: incorrect qty in serial batch bundle against pick list (#38964)

(cherry picked from commit 47ee801d373058a2739c2fd42d971d624c42d5a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-27 14:06:55 +05:30
mergify[bot]
82960e3312
fix: reset the incoming rate on changing of the warehouse (backport #38925) (#38926) 
fix: reset the incoming rate on changing of the warehouse (#38925)

(cherry picked from commit 161ae1edd1ebcafd14d7a302ad1adde238e43426)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-22 17:55:58 +05:30
Deepesh Garg
b52ceceeb7
Merge pull request #38808 from vorasmit/fetch-item-taxes-v15 
fix: fetch item_tax_template values if fields with fetch_from exisit (#38284)
 2023-12-17 18:51:05 +05:30
mergify[bot]
8990c48e7b
fix: serial and batch bundle return not working (backport #38754) (#38806) 
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

(cherry picked from commit 0743289925d0866a16373c05cfb81825b58e35ba)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-17 18:02:31 +05:30
Smit Vora
fba28d6941 fix: fetch item_tax_template values if fields with fetch_from exisit 2023-12-17 13:59:22 +05:30
mergify[bot]
a551660d2a
fix: timezone aware SLA banner (backport #38745) (#38747) 
fix: timezone aware SLA banner (#38745)

(cherry picked from commit eaf86a6461438720fe941100d6feccefbfa3bfed)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-14 15:59:21 +05:30
mergify[bot]
3fabca1051
Revert "fix(ux): don't update qty blindly" (backport #38728) (#38730) 
Revert "fix(ux): don't update qty blindly" (#38728)

(cherry picked from commit 6851c5042fc5e2d3f45d070af18a33c24fc10794)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-13 23:16:15 +05:30
mergify[bot]
1dcb065c64
fix: barcode scanning for the stock entry (backport #38716) (#38718) 
fix: barcode scanning for the stock entry (#38716)

(cherry picked from commit 13cba5068bd1d09bff4204a64a74999876566b6b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-13 18:32:48 +05:30
mergify[bot]
6e2cde4a21
fix: show stock qty in popup (backport #38698) (#38699) 
fix: show stock qty in popup (#38698)

(cherry picked from commit b562b4cf99e68108a0d7ba3a90e60ef3d7d01b0f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 17:04:57 +05:30
ruthra kumar
9239e735ad fix: typeerror on new sites (#38692) 
(cherry picked from commit fa2d33cb50753449cc8f4218c94d07ed99f2af03)
 2023-12-12 10:14:39 +00:00
mergify[bot]
4150ed9b3b
fix: Shipping Address Link Showing in Buying (backport #38634) (#38646) 
fix(ux): `Shipping Address Link`

(cherry picked from commit ca0c3eb184b02f56f36879f9472ce82b55dcee1d)

Co-authored-by: creative-paramu <pparameshwari@thirvusoft.in>
 2023-12-08 19:04:24 +05:30
mergify[bot]
0b2e2a2ab5
fix(ux): don't update qty blindly (backport #38608) (#38639) 
fix(ux): don't update qty blindly

(cherry picked from commit 0156339f3433f1a3ddb08885d2b85902c1114345)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-08 17:59:32 +05:30
Shariq Ansari
d79e6e353e fix: format only if searched text contain link value text 
(cherry picked from commit 08ed3cd31394eb1108dc29a7a5b3f6ded85e3656)
 2023-12-07 15:18:52 +00:00
mergify[bot]
88d2a8d668
fix: scan for serial or batch in bundle (backport #38534) (#38552) 
fix: scan for serial or batch in bundle (#38534)

(cherry picked from commit c8693cdf37ba9e91bf47d89de69aafc2fde5e6ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-04 15:24:28 +05:30
mergify[bot]
4a558b7efb
fix: use predefined onload property load_after_mapping (#38209) 
fix: use predefined onload property `load_after_mapping` (#38209)

(cherry picked from commit b6a7549407bc04225f0bb7c144284078a314f430)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2023-12-04 09:36:52 +05:30
Gursheen Anand
0e50e77d8e fix: unset discount amount based on coupon code 
(cherry picked from commit 6518582ed3be49dd3bc6a62745dae3e6faed2658)
 2023-11-29 10:25:19 +00:00
Patrick Eissler
95f9cc99b9 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>
(cherry picked from commit 8e4b591ea2ad420a7c861a06414d3bee6e6ee042)
 2023-11-29 04:54:25 +00:00
ruthra kumar
100ce27a60 chore: update new unreconcile doctype name in JS and PY files 
(cherry picked from commit 74f9e34182563b5dd3ef71d93b66596a12be5e91)
 2023-11-23 05:09:24 +00:00
Vishakh Desai
aef955c920 fix: Supplier Quotation fields (#37963) 
(cherry picked from commit c2bda2c70535ad9e8a61e752bbb551f387460125)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-20 04:42:48 +00:00
Dany Robert
70eccf7da0 fix: wrong round off and rounded total 
(cherry picked from commit 3a487bd33af1972d9ee8b7bb2f6277775c8e018e)
 2023-11-19 13:49:19 +00:00
ruthra kumar
e2dd414793 refactor: use 'boolean' parameter while fetching FY year 
(cherry picked from commit c31ee8ea33afcc8128270f098c40cc0b0e3f1a49)
 2023-11-16 04:18:34 +00:00
mergify[bot]
18e40dd032
refactor: remove extraneous disabled filters (backport #37732) (#37749) 
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f84979e12b8091492be7eddbf0caa56)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-10-30 09:57:32 +05:30
Maharshi Patel
889f84bcb7 chore: new erpnext logo as per espresso 
(cherry picked from commit fff97b1cd20305adf6bbd4478adf86d6847cc025)
 2023-10-20 12:25:04 +00: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
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
Rishik Sahu
5ebf7c8c29 fixed-#37231-changed-doc-to-d/closes-the-isse 2023-10-12 14:03:49 +05:30
Dany Robert
6a27cbd61d
Merge branch 'frappe:develop' into rounded-row-wise-tax 2023-10-11 12:31:13 +05:30
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
40e7c43ce3 refactor: import financial_statement in erpnext bundle 2023-10-07 21:03:31 +05:30
mergify[bot]
10c666bf69
fix: incorrect status of the returned purchase receipt (backport #37300) (#37380) 
fix: incorrect status of the returned purchase receipt (#37300)

(cherry picked from commit 63f45739e05d728e8844320ff0c7dbafa8660acf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-06 14:43:13 +05:30
Ankush Menat
2dc95e5d59
fix: trial balance report freezes when adding filters (#37264) 
fix: Only add onclick if correct data is returned

workaround for https://github.com/frappe/datatable/issues/177
 2023-09-27 12:34:40 +05:30
ruthra kumar
150728deaa refactor: button on PE to filter associated Journals 2023-09-22 11:30:47 +05:30
rohitwaghchaure
dd4769ecf1
feat: allow to edit Stock Quantity in the Sales and Purchase Transactions (#36600) 
feat: allow to edit Stock Quantity in the Sales and Purchase transactions
 2023-09-20 18:09:03 +05:30
Raffael Meyer
57d5c8a837
fix: update help links (#37098) 2023-09-19 19:59:16 +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
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
Ankush Menat
7045810bae refactor: move clear data button to user action 2023-09-15 20:47:28 +05:30
ruthra kumar
f2b0ac6868 refactor: move unreconcile btn inside a drop down 2023-09-15 16:19:27 +05:30
ruthra kumar
1d93d66c30 refactor: cancel gain/loss JE on multi currency transactions 2023-09-08 21:29:13 +05:30
ruthra kumar
6fd1c1bca2 refactor: display allocated amount in account currency with symbol 2023-09-05 09:34:01 +05:30
ruthra kumar
0ccb6d8242 chore: rename and add trigger in journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
1981f3837a chore: fetch logic for payment entry 2023-09-05 08:34:26 +05:30
ruthra kumar
25fe752185 chore: move functions to a separate file in utils 2023-09-05 08:34:26 +05:30
ruthra kumar
5981c7e0ad chore: move dialog building function to utils.js file 2023-09-05 08:34:26 +05:30