shutro-erp 0.3.6 → 0.3.7

package/dist/website_sale/module.js

@@ -10,6 +10,7 @@ import { paymentShutro } from '../payment/index.js';
 import { productShutro } from '../product/index.js';
 import { saleAccountShutro } from '../sale_account/index.js';
 import { salesShutro } from '../sales/index.js';
+import { emitting } from '../server/index.js';
 import { orm } from '../server/orm.js';
 import { websiteShutro } from '../website/index.js';
 import { check, defineModel, defineModule, extendModel, f, method, records, } from './.kosh/bindings.js';
@@ -33,8 +34,6 @@ export const ProductShop = extendModel('product.product', {
         published: f.boolean({ default: false, label: 'On the shop' }),
         /** What the shop says about it (English and Bangla). */
         websiteDescription: f.text({ translate: true, label: 'Shop description' }),
-        /** For fees by weight, in kg. */
-        weight: f.decimal({ scale: 3, label: 'Weight (kg)' }),
         /** Shown with it on its page. */
         related: f.many2many('product.product', {
             relation: 'product_shop_related_rel',
@@ -88,7 +87,12 @@ export const DeliveryCarrier = defineModel('delivery.carrier', {
     access: { 'sales.user': ['read'], 'sales.manager': ALL, 'website.manager': ALL },
     fields: {
         name: f.char({ required: true, translate: true }),
-        kind: f.selection({ fixed: 'Fixed fee', weight: 'By weight', zone: 'By zone' }, { required: true, default: 'fixed', label: 'Fee by' }),
+        kind: f.selection({ fixed: 'Fixed fee', weight: 'By weight', zone: 'By zone' }, {
+            required: true,
+            default: 'fixed',
+            label: 'Fee by',
+            help: 'How the delivery fee is worked out: one fixed fee, by the parcel’s weight or by whether the city is inside the zone.',
+        }),
         /** The fixed fee; by weight, the fee of the first kg. */
         price: f.decimal({ scale: 2, required: true, default: '0', label: 'Fee' }),
         /** By weight: each kg (or part of one) beyond the first. */
@@ -101,7 +105,12 @@ export const DeliveryCarrier = defineModel('delivery.carrier', {
         freeOver: f.decimal({ scale: 2, label: 'Free from' }),
         /** Customers may pay the courier on delivery. */
         cod: f.boolean({ default: true, label: 'Cash on delivery' }),
-        courier: f.selection(COURIERS, { required: true, default: 'none', label: 'Courier' }),
+        courier: f.selection(COURIERS, {
+            required: true,
+            default: 'none',
+            label: 'Courier',
+            help: 'The courier service that books and delivers the parcels of this method.',
+        }),
         /** The service product the fee is charged as on orders (made with the method). */
         product: f.many2one('product.product', { ondelete: 'restrict', label: 'Fee product' }),
         sequence: f.integer({ required: true, default: 10 }),
@@ -148,7 +157,12 @@ export const ShopCoupon = defineModel('shop.coupon', {
         /** What the customer types (upper case). */
         code: f.char({ required: true, size: 40 }),
         name: f.char({ translate: true, label: 'What it gives' }),
-        kind: f.selection({ percent: 'Percentage off the goods', amount: 'Amount off', free_delivery: 'Free delivery' }, { required: true, default: 'percent', label: 'Gives' }),
+        kind: f.selection({ percent: 'Percentage off the goods', amount: 'Amount off', free_delivery: 'Free delivery' }, {
+            required: true,
+            default: 'percent',
+            label: 'Gives',
+            help: 'What the coupon gives: a percentage off the goods, an amount off or free delivery.',
+        }),
         value: f.decimal({ scale: 2, required: true, default: '0', label: 'Value' }),
         /** The goods must come to this much. */
         minimum: f.decimal({ scale: 2, required: true, default: '0', label: 'From' }),
@@ -266,7 +280,11 @@ export const DeliveryShipment = defineModel('delivery.shipment', {
         }),
         order: f.many2one('sale.order', { required: true, ondelete: 'restrict', label: 'Order' }),
         carrier: f.many2one('delivery.carrier', { required: true, ondelete: 'restrict' }),
-        courier: f.selection(COURIERS, { required: true, default: 'fake' }),
+        courier: f.selection(COURIERS, {
+            required: true,
+            default: 'fake',
+            help: 'The courier service the parcel is booked with.',
+        }),
         recipient: f.char({ required: true }),
         phone: f.char({ required: true }),
         address: f.char({ required: true }),
@@ -281,6 +299,7 @@ export const DeliveryShipment = defineModel('delivery.shipment', {
         events: f.one2many('delivery.shipment.event', 'shipment', { label: 'Tracking' }),
         note: f.text(),
         state: f.state({
+            help: 'Follows the parcel from booking with the courier through pick-up and transit to delivery or return.',
             states: {
                 draft: 'To book',
                 booked: 'Booked',
@@ -328,7 +347,7 @@ export const DeliveryShipment = defineModel('delivery.shipment', {
                 },
                 pick: { from: ['booked'], to: 'picked' },
                 transit: { from: ['booked', 'picked'], to: 'in_transit' },
-                deliver: {
+                deliver: emitting('delivery.shipment.delivered', {
                     from: ['booked', 'picked', 'in_transit'],
                     to: 'delivered',
                     after: records('delivery.shipment', async (shipments) => {
@@ -336,8 +355,11 @@ export const DeliveryShipment = defineModel('delivery.shipment', {
                             if (s.cod.gt(0) && !s.codCollected)
                                 await s.write({ codCollected: true, codCollectedAt: new Date() });
                     }),
-                },
-                bounce: { from: ['booked', 'picked', 'in_transit'], to: 'returned' },
+                }),
+                bounce: emitting('delivery.shipment.returned', {
+                    from: ['booked', 'picked', 'in_transit'],
+                    to: 'returned',
+                }),
                 cancel: {
                     from: ['draft', 'booked'],
                     to: 'cancel',
@@ -375,7 +397,7 @@ export const DeliveryShipmentEvent = defineModel('delivery.shipment.event', {
 });
 export const websiteSaleShutro = defineModule({
     name: 'website_sale',
-    version: '0.3.0',
+    version: '0.4.0',
     depends: [websiteShutro, salesShutro, saleAccountShutro, paymentShutro, productShutro],
     groups: [
         orm.defineGroup({

package/dist/website_sale/shop.js

@@ -188,9 +188,12 @@ export async function newCart(env, site) {
         .model('res.company')
         .browse([site.company])
         .load({ currency: true });
+    const visitor = await visitorOf(env, site);
     const made = await env.model('sale.order').create([
         {
-            partner: (await visitorOf(env, site)),
+            partner: visitor,
+            // The customer's price list, when they have one (RFC 0028 §3.1).
+            pricelist: (await pricelistOf(env, visitor)),
             currency: company?.currency.id,
             company: site.company,
             website: site.id,
@@ -228,7 +231,7 @@ export async function cartView(env, id) {
     const goods = [...o.lines].filter((l) => !l.isDelivery && !l.isDiscount);
     const fee = [...o.lines]
         .filter((l) => l.isDelivery)
-        .reduce((s, l) => s.plus(l.priceUnit.times(l.quantity)), zero);
+        .reduce((s, l) => s.plus((l.priceUnit ?? zero).times(l.quantity)), zero);
     const payments = await (await env.model('payment.transaction').search({
         where: { saleOrder: id },
         order: ['id desc'],
@@ -243,8 +246,8 @@ export async function cartView(env, id) {
             product: l.product.id,
             name: l.name,
             quantity: l.quantity.toString(),
-            price: money(l.priceUnit),
-            subtotal: money(l.priceUnit.times(l.quantity)),
+            price: money(l.priceUnit ?? zero),
+            subtotal: money((l.priceUnit ?? zero).times(l.quantity)),
         })),
         carrier: o.carrier === null ? null : { id: o.carrier.id, name: o.carrier.name },
         delivery: money(fee),
@@ -253,12 +256,22 @@ export async function cartView(env, id) {
         total: money(o.amountTotal?.amount),
         coupon: o.coupon === null ? null : o.coupon.code,
         discount: money([...o.lines].reduce((s, l) => l.isDiscount
-            ? s.minus(l.priceUnit.times(l.quantity))
-            : s.plus(l.priceUnit.times(l.quantity).times(l.discount).div(100)), zero)),
+            ? s.minus((l.priceUnit ?? zero).times(l.quantity))
+            : s.plus((l.priceUnit ?? zero).times(l.quantity).times(l.discount).div(100)), zero)),
         payment: o.shopPayment,
         paymentState: [...payments][0]?.state ?? null,
     };
 }
+/** A customer's price list (RFC 0028 §3.1), or null. */
+async function pricelistOf(env, partner) {
+    if (typeof partner !== 'number')
+        return null;
+    const [p] = await env
+        .model('res.partner')
+        .browse([partner])
+        .load({ pricelist: true });
+    return p?.pricelist?.id ?? null;
+}
 const goodsOf = async (env, id) => {
     const [o] = await env
         .model('sale.order')
@@ -267,7 +280,7 @@ const goodsOf = async (env, id) => {
     const goods = [...(o?.lines ?? [])].filter((l) => !l.isDelivery && !l.isDiscount);
     return {
         order: o,
-        amount: goods.reduce((s, l) => s.plus(l.priceUnit.times(l.quantity)), zero),
+        amount: goods.reduce((s, l) => s.plus((l.priceUnit ?? zero).times(l.quantity)), zero),
         weight: goods.reduce((s, l) => s.plus((l.product.weight ?? zero).times(l.quantity)), zero),
     };
 };
@@ -310,7 +323,7 @@ export async function setLine(env, id, product, quantity) {
                 name: p.name,
                 quantity,
                 uom: p.uom?.id ?? null,
-                priceUnit: p.listPrice,
+                // Priced by the cart's price list (the customer's), else at the list price (RFC 0028 §3.1).
                 taxes: { set: [...p.taxes.ids] },
             },
         ]);
@@ -356,7 +369,7 @@ async function refreshCoupon(env, id) {
     if (o === undefined)
         return;
     const goods = [...o.lines].filter((l) => !l.isDelivery && !l.isDiscount);
-    const amount = goods.reduce((s, l) => s.plus(l.priceUnit.times(l.quantity)), zero);
+    const amount = goods.reduce((s, l) => s.plus((l.priceUnit ?? zero).times(l.quantity)), zero);
     let coupon = o.coupon;
     if (coupon !== null && couponProblem(env, coupon, amount) !== null) {
         await env.model('sale.order').browse([id]).write({ coupon: null });

package/dist/website_sale_stock/.kosh/bindings.js

@@ -1,4 +1,4 @@
-// GENERATED by `pnpm generate:models` (Shutro’s generator). Do not edit. definitions-hash: bba8c437e7698bc8
+// GENERATED by `pnpm generate:models` (Shutro’s generator). Do not edit. definitions-hash: d548901fa3196226
 // Bindings of module `website_sale_stock`: import the definition API from here to get types scoped to what it can see.
 export { defineModel, defineModule, extendModel, f, replace } from '../../server/orm.js';
 import { definitions } from '../../server/orm.js';