Commit Graph

1343 Commits

Author SHA1 Message Date
mergify[bot]
d60a6cb2f8 fix: disable form save on naming series tool (#30909) (#30910)
(cherry picked from commit f31122cbc3)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-05-05 17:38:11 +05:30
marination
34437a83df fix: Validate field filter wrt to Website Item & re-use validation in Item Group 2022-04-18 19:24:08 +05:30
marination
bed9e09153 fix: Query filter fields from Website Item instead of Item master
- tweak `filters.py` to correctly query filter field values from Website Item
- Use Website Item for filter field options in Settings and Item Group Field Filter table
2022-04-18 19:23:17 +05:30
Deepesh Garg
5776881f34 feat: Item-wise provisional accounting for service items
(cherry picked from commit 3ce64170db)
2022-04-14 07:01:23 +00:00
Deepesh Garg
ae11562611 test: Ignore parent company account creation
(cherry picked from commit dec0c1b5bb)
2022-04-06 05:27:32 +00:00
Ankush Menat
c07713b860 style: bulk format code with black
v13 port because otherwise backports will result in conflicts always
2022-03-29 17:29:34 +05:30
marination
a56fd20ab4 fix: Sub-Categpry Routing in Item Group Page Listing pills
- Use absolute route even 3-4 sub-category levels down
- Remove scroll from category pills due to accessibility issues
- Arrange sub-category pills alphabetically

(cherry picked from commit 8264d6b0bc)
2022-03-15 12:00:33 +00:00
marination
c8026eb9df test: Test include_descendants in Item Group Product Listing
- Also made include_descendants field's visibility dependant on show_in_website

(cherry picked from commit 3507cf5985)
2022-03-09 11:16:55 +00:00
marination
7f234c7e34 feat: Include child item group products in Item Group Page & cleanup
- Added 'Include descendants' checkbox, which will pull child item group products too
- Build item group filters in query engine file
- Include logic in filter engine
- Clean up Website section of Item Group page (UX)
- Add util to fetch child item groups including self

(cherry picked from commit b2755f6fdd)
2022-03-09 11:16:55 +00:00
Mohamed-D-Ouf
3d8eaa5392 fix: add filters in default_discount_account (#30095) 2022-03-09 11:25:36 +05:30
Deepesh Garg
aa16a4bb5f chore: Resolve conflicts 2022-02-01 15:02:23 +05:30
Deepesh Garg
a54c84728f feat: Provisional accounting for expenses (#29451)
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch

(cherry picked from commit 528c71382f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/setup/doctype/company/company.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
2022-02-01 09:13:47 +00:00
Rohit Waghchaure
e28b046cf9 fix: accounts are coming from different company in the dropdown
(cherry picked from commit dabe5981bb)
2022-01-13 15:42:50 +00:00
mergify[bot]
b808ef1625 feat: allow user to change the parent company (#29138) 2022-01-04 19:29:39 +05:30
mergify[bot]
ef47570977 test: remove unnecessary creation of companies #28965 (#28967)
test: remove unnecessary creation of companies
(cherry picked from commit d7148adee5)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-20 23:22:34 +05:30
mergify[bot]
521318b4ad fix: cannot load company form (#28663) 2021-12-03 15:58:29 +05:30
Saqib
0808438508 fix: remove change_abbr method (#28691) 2021-12-02 15:00:42 +05:30
Ankush Menat
fbfaf75b66 chore: remove __future__ py2 compatibility imports 2021-11-25 17:42:24 +05:30
Saqib
80d0b6ddc8 revert: "feat: Accounts, Selling & Assets Onboarding cleanup (#28491)" (#28559) 2021-11-25 16:36:29 +05:30
mergify[bot]
358205b177 feat: Accounts, Selling & Assets Onboarding cleanup (#28491) 2021-11-22 16:45:23 +05:30
mergify[bot]
063d474cd0 refactor!: remove abbreviation renaming (#28441) 2021-11-22 11:36:56 +05:30
mergify[bot]
2c9b995c71 fix: remove item-item group name validation (#28392) (#28399)
(cherry picked from commit 043e3255d6)

Co-authored-by: Rohan <Alchez@users.noreply.github.com>
2021-11-15 20:01:37 +05:30
mergify[bot]
c1a1e9c399 fix: don't make naming series mandatory for items (backport #28394) (#28396)
* fix: don't make naming series mandatory for items

Item variants are an exception, hence this needs to be checked
conditionally.

(cherry picked from commit 7fcaeca403)

* fix: patch for naming series property setter

(cherry picked from commit 54184e54ed)

# Conflicts:
#	erpnext/patches.txt

* fix: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-11-15 18:56:15 +05:30
mergify[bot]
37088391bb feat: add enabled field in UOM (#27993) (#27996)
(cherry picked from commit 7717b99edb)

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2021-10-19 10:56:33 +05:30
GangaManoj
4ecb798585 fix: Delete linked Transaction Deletion Record docs on deleting company
(cherry picked from commit 38c7e42f0c)
2021-10-05 05:19:37 +00:00
Frappe PR Bot
450e1e8ed4 fix: no validation on item defaults (#27549)
* fix: no validation on item defaults (#27393)

* fix: no validation on item defaults

* fix: cache value while validating

* test: item default company relation

* fix: reorder validations

* refactor: add guard conditions on update_defaults

* test: add default warehouse for item group

* fix: validate item defaults for item groups

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 5eba1ccd51)

# Conflicts:
#	erpnext/setup/doctype/item_group/item_group.py
#	erpnext/stock/doctype/item/item.py

* fix: resolve conflicts

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-16 12:25:39 +00:00
Chillar Anand
4b2be2999f chore: Cleanup imports (#27320)
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Remove imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Fix sider issues

* chore: linting

* chore: linting / sorting import

from ecommerce refactor merge

* ci: dont allow unused imports

* chore: sort / clean ecommerce imports

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-03 18:57:43 +05:30
Marica
7c09a79dd4 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-09-02 10:25:14 +05:30
Ankush Menat
187c3f9630 fix: invalid escape sequences in regex 2021-09-01 20:20:32 +05:30
marination
7ab858a9b0 Chore: Miscellaneous UI review changes
- Added bg (variable) to pages, card space separation visible
- Removed `show brand line` in settings, shown by default
- Re-arranged settings by importance
- View toggling primary colour is grey
- Only populate recent searches on successful search
- Hit only one server side api, once while searching
- List view primary button float right
- Discounts takes upper limit eg. 10% and below
- Navbar icons only wiggle on qty increase in cart/wishlist
- Pay button in SO portal
- Remove bottom white space below item full page image, min-height fits to content
- List view vertical space between heading and item code
- Empty offer subtitle handled
2021-09-01 14:57:50 +05:30
Frappe PR Bot
2dc2dac56a fix: email digest original_user issue (#27191) (#27256)
(cherry picked from commit 48f2e5ac1d)

Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
2021-08-31 18:08:33 +05:30
marination
fd44b6b340 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-30 22:30:02 +05:30
Frappe PR Bot
8dae084f23 chore: remove deprecated and empty QUnit tests (#27179) (#27181)
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.

(cherry picked from commit ae55eab599)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 21:08:08 +05:30
marination
06a6fd512a Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-26 16:53:59 +05:30
Dany Robert
7b9a23eb7a feat: Increase number of supported currency exchanges (#26763)
* fix: update test suite to accodomate new currency exchange function

* feat: Increase number of supported currency exchanges

* fix: don't make api call when testing

* remove condition for test(being fixed in another pull request)
2021-08-25 21:15:44 +05:30
marination
280f615ded Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-24 11:48:13 +05:30
Frappe PR Bot
2fd823ffb6 fix: Cascade deletion for Company (#26923) (#27053)
* fix: Cascade deletion for Company

(cherry picked from commit 2b2572b9b9)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-08-20 15:20:50 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
marination
71b0e0a146 test: Product Query & Filter Engine, Item Group Page
- Test for ProductQuery engine and ProductFilters engine
- Test for engine for Item Group too
- Renamed ‘product_configurator’ to ‘variant_selector’
- Cleaned up filters.py
- Modal freeze backdrop lighter only in cart, since there’s nothing over it
- Fixed unusual spacing in variant selector dialog
- Made `get_child_groups_for_website` more readable
- Replaced ‘Configure’ with ‘Select’ for variant selection
2021-08-17 01:55:46 +05:30
Marica
2416634385 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-08-12 19:03:44 +05:30
marination
1fec5bbdb6 chore: Re-organise files,remove T&C modal in cart
- Moved product query and filters engine to `product_data_engine` folder
- Moved product grid, list, search, view to `product_ui` folder
- Renamed `website_item_indexing.py` to `redisearch.py`
- Render Terms and Conditions server side along with the rest of the Shopping cart. Don’t make another db call
- Style changes to terms and conditions
- Deleted unused `cart_terms.html`
- Removed print statements
2021-08-12 19:01:10 +05:30
Frappe PR Bot
1a39d1a311 fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
marination
d477b99c1d Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-09 13:41:45 +05:30
marination
20bc65c97b test: Website Item (Item full page)
- Tests for website item. Desk tests and portal tests
- Allow guests on method `get_offer_details`
- Fetch stock details only if `show_stock_availability` is enabled
- Validation for duplicate web items on item merge
- Separate method for `validate_properties_before_merge`
- Common error title and exception `DataValidationError` for merge validations on Item
2021-08-09 13:25:13 +05:30
GangaManoj
fcbd79b7d3 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-asset-repair-refactor 2021-08-06 18:12:24 +05:30
Frappe PR Bot
b13e46071a fix: Let all System Managers be able to delete Company transactions (#26815) (#26819)
(cherry picked from commit 884d8cf065)

Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
2021-08-06 10:39:58 +05:30
Anupam
e5fea372af fix: frappe linter 2021-07-29 11:05:38 +05:30
Anupam Kumar
89f2138fbc Merge branch 'version-13-hotfix' into email-digest 2021-07-28 18:24:29 +05:30
Ganga Manoj
41705acbd9 fix: delete child docs when parent doc is deleted (#26518)
* fix: Make code more readable

* fix: Delete child table info when parent doc is deleted

* fix: Sider issues

* fix: Remove trailing whitespace
2021-07-20 20:48:57 +05:30
marination
401cbc01a9 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-07-15 21:03:01 +05:30