-
-
Notifications
You must be signed in to change notification settings - Fork 290
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
12.0 wmc sale rules #459
Open
KolushovAlexandr
wants to merge
6
commits into
itpp-labs:12.0
Choose a base branch
from
KolushovAlexandr:12.0-wmc_sale-rules
base: 12.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
12.0 wmc sale rules #459
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
161cd37
:tada::one::two: website_multi_company_separate_orders
KolushovAlexandr 87416e1
:zap: option to duplicate and buttons at cart
KolushovAlexandr 67b2c6d
:zap: portal extension
KolushovAlexandr a5f6748
:zap: order splitting
KolushovAlexandr 63262a5
:cherries: pre-commit cleanup
trojikman 9b9de69
:cherries: update copyright
trojikman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
========================================== | ||
Real Multi Website (eCommerce extension) | ||
========================================== | ||
|
||
Multi Website support in eCommerce Customization: | ||
|
||
* adds field ``website_ids`` to payment.acquirer | ||
* adds field ``website_ids`` to product.template | ||
* adds field ``website_ids`` to product.public.category | ||
|
||
Credits | ||
======= | ||
|
||
Contributors | ||
------------ | ||
* `Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>`__ | ||
|
||
Sponsors | ||
-------- | ||
* `IT-Projects LLC <https://it-projects.info>`__ | ||
|
||
Maintainers | ||
----------- | ||
* `IT-Projects LLC <https://it-projects.info>`__ | ||
|
||
To get a guaranteed support you are kindly requested to purchase the module at `odoo apps store <https://apps.odoo.com/apps/modules/12.0/website_multi_company_sale/>`__. | ||
|
||
Thank you for understanding! | ||
|
||
`IT-Projects Team <https://www.it-projects.info/team>`__ | ||
|
||
Further information | ||
=================== | ||
|
||
Demo: http://runbot.it-projects.info/demo/website-addons/12.0 | ||
|
||
HTML Description: https://apps.odoo.com/apps/modules/12.0/website_multi_company_sale/ | ||
|
||
Usage instructions: `<doc/index.rst>`_ | ||
|
||
Changelog: `<doc/changelog.rst>`_ | ||
|
||
Tested on Odoo 12.0 f34d4d33a09d33a12e427c2490b6526546114486 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). | ||
|
||
from . import models | ||
from . import controllers |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Copyright 2019 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr> | ||
# License MIT (https://opensource.org/licenses/MIT). | ||
{ | ||
"name": """Real Multi Website (eCommerce extension Customization)""", | ||
"summary": """Multi Website support in eCommerce Customization""", | ||
"category": "eCommerce", | ||
# "live_test_url": "http://apps.it-projects.info/shop/product/website-multi-company?version=12.0", | ||
"images": ["images/website_multi_company_sale_main.png"], | ||
"version": "12.0.1.5.1", | ||
"application": False, | ||
"author": "IT-Projects LLC, Kolushov Alexandr", | ||
"support": "[email protected]", | ||
"website": "https://it-projects.info/team/yelizariev", | ||
"license": "LGPL-3", | ||
"price": 9.00, | ||
"currency": "EUR", | ||
"depends": ["website_multi_company_sale", "website_sale", "portal"], | ||
"external_dependencies": {"python": [], "bin": []}, | ||
"data": [ | ||
"views/product_public_category_views.xml", | ||
"views/sale_views.xml", | ||
"views/website_views.xml", | ||
"views/templates.xml", | ||
"security/website_multi_company_sale_security.xml", | ||
], | ||
"qweb": [], | ||
"demo": [], | ||
"post_load": None, | ||
"pre_init_hook": None, | ||
"post_init_hook": None, | ||
"uninstall_hook": None, | ||
"auto_install": False, | ||
"installable": True, | ||
} |
3 changes: 3 additions & 0 deletions
3
website_multi_company_separate_orders/controllers/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# License MIT (https://opensource.org/licenses/MIT). | ||
|
||
from . import main |
166 changes: 166 additions & 0 deletions
166
website_multi_company_separate_orders/controllers/main.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
# Copyright 2019 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr> | ||
# License MIT (https://opensource.org/licenses/MIT). | ||
|
||
import json | ||
import logging | ||
|
||
from odoo import http | ||
from odoo.http import request | ||
|
||
from odoo.addons.website_sale.controllers.main import WebsiteSale | ||
|
||
_logger = logging.getLogger(__name__) | ||
|
||
|
||
class WebsiteSaleExtended(WebsiteSale): | ||
def _get_search_domain(self, *args, **kwargs): | ||
domain = super(WebsiteSaleExtended, self)._get_search_domain(*args, **kwargs) | ||
company = request.website.company_id | ||
if not company: | ||
return domain | ||
return ["|", ("company_id", "in", company.child_ids.ids)] + domain | ||
|
||
def _check_and_update_child_order( | ||
self, sale_order, product_id, add_qty, set_qty, force=False, **kw | ||
): | ||
product_company_id = product_id.company_id.id | ||
order_company = sale_order.company_id | ||
website_id = sale_order.website_id | ||
if not website_id.split_orders or not ( | ||
product_company_id | ||
and product_company_id != order_company.id | ||
and ( | ||
product_company_id in website_id.split_orders_companies.ids | ||
or force | ||
or (not add_qty and set_qty == 0) | ||
) | ||
): | ||
return False | ||
sale_order_child = sale_order.order_child_ids.filtered( | ||
lambda so: so.company_id.id == product_company_id | ||
) | ||
if not sale_order_child: | ||
pricelist_id = sale_order.pricelist_id.id | ||
sale_order_child = sale_order.sudo().create( | ||
{ | ||
"order_parent_id": sale_order.id, | ||
"company_id": product_company_id, | ||
"partner_id": sale_order.partner_id.id, | ||
"partner_invoice_id": sale_order.partner_invoice_id.id, | ||
"partner_shipping_id": sale_order.partner_shipping_id.id, | ||
"pricelist_id": pricelist_id, | ||
} | ||
) | ||
sale_order.write({"order_child_ids": [(4, sale_order_child.id)]}) | ||
_logger.info( | ||
"website_sale created new child order for company: %s for order: %s", | ||
product_company_id, | ||
sale_order.id, | ||
) | ||
|
||
# if set_qty == 0 and not add_qty: | ||
# deleted_order_lines = sale_order_child.order_line.filtered(lambda ol: ol.product_id == product_id) | ||
# deleted_order_lines.unlink() | ||
# return sale_order_child | ||
|
||
product_custom_attribute_values = None | ||
if kw.get("product_custom_attribute_values"): | ||
product_custom_attribute_values = json.loads( | ||
kw.get("product_custom_attribute_values") | ||
) | ||
no_variant_attribute_values = None | ||
if kw.get("no_variant_attribute_values"): | ||
no_variant_attribute_values = json.loads( | ||
kw.get("no_variant_attribute_values") | ||
) | ||
|
||
sale_order_child._cart_update( | ||
product_id=product_id.id, | ||
add_qty=add_qty, | ||
set_qty=set_qty, | ||
product_custom_attribute_values=product_custom_attribute_values, | ||
no_variant_attribute_values=no_variant_attribute_values, | ||
) | ||
sale_order.order_line.filtered(lambda ol: ol.product_id == product_id).unlink() | ||
return sale_order_child | ||
|
||
@http.route() | ||
def cart_update(self, product_id, add_qty=1, set_qty=0, **kw): | ||
result = super(WebsiteSaleExtended, self).cart_update( | ||
product_id, add_qty, set_qty, **kw | ||
) | ||
|
||
if add_qty: | ||
sale_order = request.website.sale_get_order() | ||
prod_id = request.env["product.product"].browse(int(product_id)) | ||
self._check_and_update_child_order( | ||
sale_order, prod_id, add_qty, set_qty, **kw | ||
) | ||
|
||
return result | ||
|
||
@http.route() | ||
def cart_update_json( | ||
self, product_id, line_id=None, add_qty=None, set_qty=None, display=True | ||
): | ||
result = super(WebsiteSaleExtended, self).cart_update_json( | ||
product_id, line_id, add_qty, set_qty, display | ||
) | ||
|
||
if set_qty: | ||
sale_order = request.website.sale_get_order() | ||
prod_id = request.env["product.product"].browse(int(product_id)) | ||
self._check_and_update_child_order(sale_order, prod_id, add_qty, set_qty) | ||
|
||
return result | ||
|
||
@http.route( | ||
["/shop/split_order_for_daughter_companies/<int:company_id>"], | ||
type="json", | ||
auth="public", | ||
methods=["POST"], | ||
website=True, | ||
csrf=False, | ||
) | ||
def split_order_for_daughter_companies(self, company_id=False): | ||
order = request.website.sale_get_order() | ||
lines = order.order_line.filtered( | ||
lambda ol: ol.product_id.company_id.id == company_id | ||
) | ||
if not lines: | ||
return False | ||
result = [] | ||
for line in lines: | ||
prod = line.product_id | ||
result.append( | ||
self._check_and_update_child_order( | ||
order, prod, line.product_uom_qty, False, "Force" | ||
) | ||
) | ||
return all(result) | ||
|
||
|
||
# class MultiCompanyPortal(CustomerPortal): | ||
# def _prepare_portal_layout_values(self): | ||
# res = super(MultiCompanyPortal, self)._prepare_portal_layout_values() | ||
# user = request.env.user | ||
# partner = user.partner_id | ||
# company_id = request.env.user.company_id | ||
# | ||
# SaleOrder = request.env['sale.order'].sudo() | ||
# quotation_count = SaleOrder.search_count([ | ||
# ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]), | ||
# ('state', 'in', ['sent', 'cancel']), | ||
# ('company_id', 'in', [company_id.id] + company_id.child_ids.ids) | ||
# ]) | ||
# order_count = SaleOrder.search_count([ | ||
# ('message_partner_ids', 'child_of', [partner.commercial_partner_id.id]), | ||
# ('state', 'in', ['sale', 'done']), | ||
# ('company_id', 'in', [company_id.id] + company_id.child_ids.ids) | ||
# ]) | ||
# res.update({ | ||
# 'quotation_count': quotation_count, | ||
# 'order_count': order_count, | ||
# }) | ||
# import wdb; wdb.set_trace() | ||
# return res |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
`1.0.0` | ||
------- | ||
|
||
- Init version | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Has to be tested |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
========================================== | ||
Real Multi Website (eCommerce extension) | ||
========================================== | ||
|
||
Installation | ||
============ | ||
|
||
* `Install <https://odoo-development.readthedocs.io/en/latest/odoo/usage/install-module.html>`__ this module in a usual way |
Binary file added
BIN
+298 KB
website_multi_company_separate_orders/images/website_multi_company_sale_main.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# License MIT (https://opensource.org/licenses/MIT). | ||
|
||
from . import product_public_category | ||
from . import sale_order | ||
from . import website |
14 changes: 14 additions & 0 deletions
14
website_multi_company_separate_orders/models/product_public_category.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# Copyright 2019 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr> | ||
# License MIT (https://opensource.org/licenses/MIT). | ||
|
||
from odoo import fields, models | ||
|
||
|
||
class ProductPublicCategory(models.Model): | ||
_inherit = "product.public.category" | ||
|
||
company_id = fields.Many2one( | ||
"res.company", | ||
"Company", | ||
default=lambda self: self.env["res.company"]._company_default_get(), | ||
) |
77 changes: 77 additions & 0 deletions
77
website_multi_company_separate_orders/models/sale_order.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
# Copyright 2019 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr> | ||
# License MIT (https://opensource.org/licenses/MIT). | ||
|
||
from odoo import api, fields, models | ||
|
||
|
||
class SaleOrder(models.Model): | ||
_inherit = "sale.order" | ||
|
||
order_parent_id = fields.Many2one("sale.order", "Parent Order", readonly=True) | ||
order_child_ids = fields.One2many( | ||
"sale.order", "order_parent_id", "Child Orders", readonly=True | ||
) | ||
|
||
@api.multi | ||
def action_done(self): | ||
result = super(SaleOrder, self).action_done() | ||
children = self.mapped("order_child_ids") | ||
if children: | ||
children.action_done() | ||
return result | ||
|
||
@api.multi | ||
def action_confirm(self): | ||
result = super(SaleOrder, self).action_confirm() | ||
children = self.mapped("order_child_ids") | ||
if children: | ||
children.action_confirm() | ||
return result | ||
|
||
@api.multi | ||
def action_cancel(self): | ||
result = super(SaleOrder, self).action_cancel() | ||
children = self.mapped("order_child_ids") | ||
if children: | ||
children.action_cancel() | ||
return result | ||
|
||
@api.multi | ||
def write(self, values): | ||
result = super(SaleOrder, self).write(values) | ||
if "partner_id" in values: | ||
for record in self: | ||
if record.order_child_ids: | ||
record.order_child_ids.write( | ||
{ | ||
"partner_id": values["partner_id"], | ||
"partner_invoice_id": values["partner_id"], | ||
"partner_shipping_id": values["partner_id"], | ||
} | ||
) | ||
return result | ||
|
||
|
||
# class AccountInvoice(models.Model): | ||
# _inherit = 'account.invoice' | ||
# | ||
# @api.multi | ||
# def register_payment(self, payment_line, writeoff_acc_id=False, writeoff_journal_id=False): | ||
# result = super(AccountInvoice, self).register_payment(payment_line, writeoff_acc_id, writeoff_journal_id) | ||
# for record in self: | ||
# if record.state != 'paid': | ||
# return result | ||
# sale_line_ids = record.invoice_line_ids[0].sale_line_ids | ||
# if sale_line_ids: | ||
# order = sale_line_ids[0].order_id.sudo() | ||
# children = order.order_child_ids.filtered(lambda o: o.invoice_status not in ['cancel', 'invoiced']) | ||
# if children: | ||
# children.action_cancel() | ||
# parent = order.order_parent_id | ||
# if parent: | ||
# product_ids = order.order_line.mapped(lambda ol: ol.product_id.id) | ||
# order_line_ids = parent.order_line.filtered(lambda ol: ol.product_id.id in product_ids) | ||
# order_line_ids.write({ | ||
# 'product_uom_qty': 0, | ||
# }) | ||
# return result |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Чем это отличается от https://github.com/itpp-labs/website-addons/tree/12.0/website_multi_company_sale ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ничем, видимо скопировано и не исправлено