CriptoMart/addons-cm
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: CriptoMart:876e7b1fbfd9a446dfb89832886be09f13f21ae0
Branches Tags
CriptoMart:16.0
CriptoMart:18.0
CriptoMart:17.0
CriptoMart:feature/refactor-cyclomatic-complexity
CriptoMart:test
CriptoMart:12.0
CriptoMart:master
..
compare: CriptoMart:56509892e625901360ef86f5b2d2e7ea2548c876
Branches Tags
CriptoMart:18.0
CriptoMart:16.0
CriptoMart:17.0
CriptoMart:feature/refactor-cyclomatic-complexity
CriptoMart:test
CriptoMart:12.0
CriptoMart:master

No commits in common. "876e7b1fbfd9a446dfb89832886be09f13f21ae0" and "56509892e625901360ef86f5b2d2e7ea2548c876" have entirely different histories.
876e7b1fbf ... 56509892e6

4 changed files with 2641 additions and 2547 deletions
Download patch file Download diff file Expand all files Collapse all files

10
product_sale_price_from_pricelist/models/sale_order.py
View file

@ -8,16 +8,6 @@ _logger = logging.getLogger(__name__)
class SaleOrder(models.Model):
_inherit = "sale.order"
def cron_action_update_lines_from_list_price(self):
records = self.env["sale.order"].search(
[
("invoice_status", "!=", "invoiced"),
("invoice_status", "!=", "up_to_date"),
("state", "!=", "cancel"),
]
)
records.action_update_lines_from_list_price()
def action_update_lines_from_list_price(self):
"""Copy current product list price into sale order lines.

2591
website_sale_aplicoop/i18n/es.po
View file

File diff suppressed because it is too large Load diff

2564
website_sale_aplicoop/i18n/eu.po
View file

File diff suppressed because it is too large Load diff

23
website_sale_aplicoop/views/portal_templates.xml
View file

@ -31,16 +31,16 @@
—
</t>
</td>
<!-- Action buttons disabled
<!-- Action buttons -->
<td class="text-center">
<t t-if="order.group_order_id">
<!-- Load in Cart button: available for all states -->
<a t-attf-href="/eskaera/#{order.group_order_id.id}/load-from-history/#{order.id}"
class="btn btn-sm btn-primary me-1"
t-att-title="'Load order items into cart' if order.state == 'draft' else 'Create new order from this one'">
<i class="fa fa-cart-arrow-down"></i>
</a>
<!-- Confirm button: only for draft orders -->
<t t-if="order.state == 'draft'">
<a t-attf-href="/eskaera/#{order.group_order_id.id}/checkout"
class="btn btn-sm btn-success"
@ -49,12 +49,11 @@
</a>
</t>
</t>
</td> -->
</td>
</xpath>
</template>
<!-- Add Load in Cart button to sidebar -->
<!-- deshabilitado, da problemas en la recarga con productos no disponibles y cambios de precios
<template id="portal_order_page_sidebar_button" inherit_id="sale.sale_order_portal_template" name="Order Page - Add Load in Cart Button">
<xpath expr="//div[@id='sale_order_sidebar_button']" position="inside">
<t t-if="sale_order.group_order_id">
@ -65,7 +64,8 @@
</a>
</t>
</xpath>
</template> -->
</template>
<!-- Custom portal content template with group order info -->
<template id="sale_order_portal_content_aplicoop" inherit_id="sale.sale_order_portal_content" name="Sale Order Portal Content - Aplicoop">
<!-- Insert group order info BEFORE the products table -->
@ -89,9 +89,14 @@
</t>
<t t-else="">
<span class="badge bg-primary">
<t t-set="day_idx" t-value="int(sale_order.group_order_id.pickup_day) % 7 if sale_order.group_order_id.pickup_day else 0"/>
<t t-esc="day_names[day_idx] if day_names else ''"/>,
<t t-esc="sale_order.pickup_date.strftime('%d/%m/%Y')"/>
<t t-if="sale_order.pickup_slot_label">
<t t-esc="sale_order.pickup_slot_label"/>
</t>
<t t-else="">
<t t-set="day_idx" t-value="int(sale_order.group_order_id.pickup_day) % 7 if sale_order.group_order_id.pickup_day else 0"/>
<t t-esc="day_names[day_idx] if day_names else ''"/>,
<t t-esc="sale_order.pickup_date.strftime('%d/%m/%Y')"/>
</t>
</span>
<span class="mt-2 small">
<t t-foreach="sale_order.group_order_id.group_ids" t-as="group">