Backend improvements: views, fields_get, session, RPC stubs
- Improved auto-generated list/form/search views with priority fields, two-column form layout, statusbar widget, notebook for O2M fields - Enhanced fields_get with currency_field, compute, related metadata - Fixed session handling: handleSessionInfo/handleSessionCheck use real session from cookie instead of hardcoded values - Added read_progress_bar and activity_format RPC stubs - Improved bootstrap translations with lang_parameters - Added "contacts" to session modules list Server starts successfully: 14 modules, 93 models, 378 XML templates, 503 JS modules transpiled — all from local frontend/ directory. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Marc
@@ -2,6 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"odoo-go/pkg/orm"
|
||||
)
|
||||
@@ -155,45 +156,25 @@ func initAccountMove() {
|
||||
// -- Computed Fields --
|
||||
// _compute_amount: sums invoice lines to produce totals.
|
||||
// Mirrors: odoo/addons/account/models/account_move.py AccountMove._compute_amount()
|
||||
//
|
||||
// Separates untaxed (product lines) from tax (tax lines) via display_type,
|
||||
// then derives total = untaxed + tax.
|
||||
computeAmount := func(rs *orm.Recordset) (orm.Values, error) {
|
||||
env := rs.Env()
|
||||
moveID := rs.IDs()[0]
|
||||
|
||||
var untaxed, tax, total float64
|
||||
rows, err := env.Tx().Query(env.Ctx(),
|
||||
`SELECT COALESCE(SUM(debit), 0), COALESCE(SUM(credit), 0)
|
||||
FROM account_move_line WHERE move_id = $1`, moveID)
|
||||
var untaxed, tax float64
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT
|
||||
COALESCE(SUM(CASE WHEN display_type IS NULL OR display_type = '' OR display_type = 'product' THEN ABS(balance) ELSE 0 END), 0),
|
||||
COALESCE(SUM(CASE WHEN display_type = 'tax' THEN ABS(balance) ELSE 0 END), 0)
|
||||
FROM account_move_line WHERE move_id = $1`, moveID,
|
||||
).Scan(&untaxed, &tax)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
if rows.Next() {
|
||||
var debitSum, creditSum float64
|
||||
if err := rows.Scan(&debitSum, &creditSum); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
total = debitSum // For invoices, total = sum of debits (or credits)
|
||||
if debitSum > creditSum {
|
||||
total = debitSum
|
||||
} else {
|
||||
total = creditSum
|
||||
}
|
||||
// Tax lines have display_type='tax', product lines don't
|
||||
untaxed = total // Simplified: full total as untaxed for now
|
||||
}
|
||||
rows.Close()
|
||||
|
||||
// Get actual tax amount from tax lines
|
||||
err = env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT COALESCE(SUM(ABS(balance)), 0)
|
||||
FROM account_move_line WHERE move_id = $1 AND display_type = 'tax'`,
|
||||
moveID).Scan(&tax)
|
||||
if err != nil {
|
||||
tax = 0
|
||||
}
|
||||
if tax > 0 {
|
||||
untaxed = total - tax
|
||||
}
|
||||
total := untaxed + tax
|
||||
|
||||
return orm.Values{
|
||||
"amount_untaxed": untaxed,
|
||||
@@ -274,6 +255,168 @@ func initAccountMove() {
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// -- Business Method: create_invoice_with_tax --
|
||||
// Creates a customer invoice with automatic tax line generation.
|
||||
// For each product line that carries a tax_id, a separate tax line
|
||||
// (display_type='tax') is created. A receivable line balances the entry.
|
||||
//
|
||||
// args[0]: partner_id (int64 or float64)
|
||||
// args[1]: lines ([]interface{} of map[string]interface{})
|
||||
// Each line: {name, quantity, price_unit, account_id, tax_id?}
|
||||
//
|
||||
// Returns: the created account.move ID (int64)
|
||||
m.RegisterMethod("create_invoice_with_tax", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
if len(args) < 2 {
|
||||
return nil, fmt.Errorf("account: create_invoice_with_tax requires partner_id and lines")
|
||||
}
|
||||
|
||||
env := rs.Env()
|
||||
|
||||
partnerID, ok := toInt64Arg(args[0])
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("account: invalid partner_id")
|
||||
}
|
||||
|
||||
rawLines, ok := args[1].([]interface{})
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("account: lines must be a list")
|
||||
}
|
||||
|
||||
// Step 1: Create the move header (draft invoice)
|
||||
moveRS := env.Model("account.move")
|
||||
moveVals := orm.Values{
|
||||
"move_type": "out_invoice",
|
||||
"partner_id": partnerID,
|
||||
}
|
||||
move, err := moveRS.Create(moveVals)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("account: create move: %w", err)
|
||||
}
|
||||
moveID := move.ID()
|
||||
|
||||
// Retrieve company_id, journal_id, currency_id from the created move
|
||||
moveData, err := move.Read([]string{"company_id", "journal_id", "currency_id"})
|
||||
if err != nil || len(moveData) == 0 {
|
||||
return nil, fmt.Errorf("account: cannot read created move")
|
||||
}
|
||||
companyID, _ := toInt64Arg(moveData[0]["company_id"])
|
||||
journalID, _ := toInt64Arg(moveData[0]["journal_id"])
|
||||
currencyID, _ := toInt64Arg(moveData[0]["currency_id"])
|
||||
|
||||
// Find the receivable account for the partner
|
||||
var receivableAccountID int64
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM account_account
|
||||
WHERE account_type = 'asset_receivable' AND company_id = $1
|
||||
ORDER BY code LIMIT 1`, companyID,
|
||||
).Scan(&receivableAccountID)
|
||||
if receivableAccountID == 0 {
|
||||
return nil, fmt.Errorf("account: no receivable account found for company %d", companyID)
|
||||
}
|
||||
|
||||
lineRS := env.Model("account.move.line")
|
||||
|
||||
var totalDebit float64 // sum of all product + tax debits
|
||||
|
||||
// Step 2: For each input line, create product line(s) and tax line(s)
|
||||
for _, rawLine := range rawLines {
|
||||
lineMap, ok := rawLine.(map[string]interface{})
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
|
||||
name, _ := lineMap["name"].(string)
|
||||
quantity := floatArg(lineMap["quantity"], 1.0)
|
||||
priceUnit := floatArg(lineMap["price_unit"], 0.0)
|
||||
accountID, _ := toInt64Arg(lineMap["account_id"])
|
||||
taxID, hasTax := toInt64Arg(lineMap["tax_id"])
|
||||
|
||||
if accountID == 0 {
|
||||
// Fallback: use journal default account
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT default_account_id FROM account_journal WHERE id = $1`, journalID,
|
||||
).Scan(&accountID)
|
||||
}
|
||||
if accountID == 0 {
|
||||
return nil, fmt.Errorf("account: no account_id for line %q", name)
|
||||
}
|
||||
|
||||
baseAmount := priceUnit * quantity
|
||||
|
||||
// Create product line (debit side for revenue)
|
||||
productLineVals := orm.Values{
|
||||
"move_id": moveID,
|
||||
"name": name,
|
||||
"quantity": quantity,
|
||||
"price_unit": priceUnit,
|
||||
"account_id": accountID,
|
||||
"company_id": companyID,
|
||||
"journal_id": journalID,
|
||||
"currency_id": currencyID,
|
||||
"partner_id": partnerID,
|
||||
"display_type": "product",
|
||||
"debit": 0.0,
|
||||
"credit": baseAmount,
|
||||
"balance": -baseAmount,
|
||||
}
|
||||
if _, err := lineRS.Create(productLineVals); err != nil {
|
||||
return nil, fmt.Errorf("account: create product line: %w", err)
|
||||
}
|
||||
totalDebit += baseAmount
|
||||
|
||||
// If a tax is specified, compute and create the tax line
|
||||
if hasTax && taxID > 0 {
|
||||
taxResult, err := ComputeTax(env, taxID, baseAmount)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("account: compute tax: %w", err)
|
||||
}
|
||||
|
||||
if taxResult.Amount != 0 && taxResult.AccountID != 0 {
|
||||
taxLineVals := orm.Values{
|
||||
"move_id": moveID,
|
||||
"name": taxResult.TaxName,
|
||||
"quantity": 1.0,
|
||||
"account_id": taxResult.AccountID,
|
||||
"company_id": companyID,
|
||||
"journal_id": journalID,
|
||||
"currency_id": currencyID,
|
||||
"partner_id": partnerID,
|
||||
"display_type": "tax",
|
||||
"tax_line_id": taxResult.TaxID,
|
||||
"debit": 0.0,
|
||||
"credit": taxResult.Amount,
|
||||
"balance": -taxResult.Amount,
|
||||
}
|
||||
if _, err := lineRS.Create(taxLineVals); err != nil {
|
||||
return nil, fmt.Errorf("account: create tax line: %w", err)
|
||||
}
|
||||
totalDebit += taxResult.Amount
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Step 3: Create the receivable line (debit = total of all credits)
|
||||
receivableVals := orm.Values{
|
||||
"move_id": moveID,
|
||||
"name": "/",
|
||||
"quantity": 1.0,
|
||||
"account_id": receivableAccountID,
|
||||
"company_id": companyID,
|
||||
"journal_id": journalID,
|
||||
"currency_id": currencyID,
|
||||
"partner_id": partnerID,
|
||||
"display_type": "payment_term",
|
||||
"debit": totalDebit,
|
||||
"credit": 0.0,
|
||||
"balance": totalDebit,
|
||||
}
|
||||
if _, err := lineRS.Create(receivableVals); err != nil {
|
||||
return nil, fmt.Errorf("account: create receivable line: %w", err)
|
||||
}
|
||||
|
||||
return moveID, nil
|
||||
})
|
||||
|
||||
// -- Double-Entry Constraint --
|
||||
// SUM(debit) must equal SUM(credit) per journal entry.
|
||||
// Mirrors: odoo/addons/account/models/account_move.py _check_balanced()
|
||||
@@ -300,6 +443,140 @@ func initAccountMove() {
|
||||
return nil
|
||||
})
|
||||
|
||||
// -- DefaultGet: Provide dynamic defaults for new records --
|
||||
// Mirrors: odoo/addons/account/models/account_move.py AccountMove.default_get()
|
||||
// Supplies date, journal_id, company_id, currency_id when creating a new invoice.
|
||||
m.DefaultGet = func(env *orm.Environment, fields []string) orm.Values {
|
||||
vals := make(orm.Values)
|
||||
|
||||
// Default date = today
|
||||
vals["date"] = time.Now().Format("2006-01-02")
|
||||
|
||||
// Default company from the current user's session
|
||||
companyID := env.CompanyID()
|
||||
if companyID > 0 {
|
||||
vals["company_id"] = companyID
|
||||
}
|
||||
|
||||
// Default journal: first active sales journal for the company
|
||||
var journalID int64
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM account_journal
|
||||
WHERE type = 'sale' AND active = true AND company_id = $1
|
||||
ORDER BY sequence, id LIMIT 1`, companyID).Scan(&journalID)
|
||||
if err == nil && journalID > 0 {
|
||||
vals["journal_id"] = journalID
|
||||
}
|
||||
|
||||
// Default currency from the company
|
||||
var currencyID int64
|
||||
err = env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT currency_id FROM res_company WHERE id = $1`, companyID).Scan(¤cyID)
|
||||
if err == nil && currencyID > 0 {
|
||||
vals["currency_id"] = currencyID
|
||||
}
|
||||
|
||||
return vals
|
||||
}
|
||||
|
||||
// -- Onchange: partner_id → auto-fill partner address fields --
|
||||
// Mirrors: odoo/addons/account/models/account_move.py _onchange_partner_id()
|
||||
// When the partner changes on an invoice, look up the partner's address
|
||||
// and populate the commercial_partner_id field.
|
||||
m.RegisterOnchange("partner_id", func(env *orm.Environment, vals orm.Values) orm.Values {
|
||||
result := make(orm.Values)
|
||||
partnerID, ok := toInt64Arg(vals["partner_id"])
|
||||
if !ok || partnerID == 0 {
|
||||
return result
|
||||
}
|
||||
|
||||
var name string
|
||||
var commercialID *int64
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT p.name, p.commercial_partner_id
|
||||
FROM res_partner p WHERE p.id = $1`, partnerID,
|
||||
).Scan(&name, &commercialID)
|
||||
if err != nil {
|
||||
return result
|
||||
}
|
||||
|
||||
if commercialID != nil && *commercialID > 0 {
|
||||
result["commercial_partner_id"] = *commercialID
|
||||
} else {
|
||||
result["commercial_partner_id"] = partnerID
|
||||
}
|
||||
return result
|
||||
})
|
||||
|
||||
// -- Business Method: register_payment --
|
||||
// Create a payment for this invoice and reconcile.
|
||||
// Mirrors: odoo/addons/account/models/account_payment.py AccountPayment.action_register_payment()
|
||||
m.RegisterMethod("register_payment", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, moveID := range rs.IDs() {
|
||||
// Read invoice info
|
||||
var partnerID, journalID, companyID, currencyID int64
|
||||
var amountTotal float64
|
||||
var moveType string
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT COALESCE(partner_id,0), COALESCE(journal_id,0), COALESCE(company_id,0),
|
||||
COALESCE(currency_id,0), COALESCE(amount_total,0), COALESCE(move_type,'entry')
|
||||
FROM account_move WHERE id = $1`, moveID,
|
||||
).Scan(&partnerID, &journalID, &companyID, ¤cyID, &amountTotal, &moveType)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("account: read invoice %d for payment: %w", moveID, err)
|
||||
}
|
||||
|
||||
// Determine payment type and partner type
|
||||
paymentType := "inbound" // customer pays us
|
||||
partnerType := "customer"
|
||||
if moveType == "in_invoice" || moveType == "in_refund" {
|
||||
paymentType = "outbound" // we pay vendor
|
||||
partnerType = "supplier"
|
||||
}
|
||||
|
||||
// Find bank journal
|
||||
var bankJournalID int64
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM account_journal WHERE type = 'bank' AND company_id = $1 LIMIT 1`,
|
||||
companyID).Scan(&bankJournalID)
|
||||
if bankJournalID == 0 {
|
||||
bankJournalID = journalID
|
||||
}
|
||||
|
||||
// Create a journal entry for the payment
|
||||
var payMoveID int64
|
||||
err = env.Tx().QueryRow(env.Ctx(),
|
||||
`INSERT INTO account_move (name, move_type, state, date, partner_id, journal_id, company_id, currency_id)
|
||||
VALUES ($1, 'entry', 'posted', NOW(), $2, $3, $4, $5) RETURNING id`,
|
||||
fmt.Sprintf("PAY/%d", moveID), partnerID, bankJournalID, companyID, currencyID,
|
||||
).Scan(&payMoveID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("account: create payment move for invoice %d: %w", moveID, err)
|
||||
}
|
||||
|
||||
// Create payment record linked to the journal entry
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`INSERT INTO account_payment
|
||||
(name, payment_type, partner_type, state, date, amount,
|
||||
currency_id, journal_id, partner_id, company_id, move_id, is_reconciled)
|
||||
VALUES ($1, $2, $3, 'paid', NOW(), $4, $5, $6, $7, $8, $9, true)`,
|
||||
fmt.Sprintf("PAY/%d", moveID), paymentType, partnerType, amountTotal,
|
||||
currencyID, bankJournalID, partnerID, companyID, payMoveID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("account: create payment for invoice %d: %w", moveID, err)
|
||||
}
|
||||
|
||||
// Update invoice payment state
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE account_move SET payment_state = 'paid' WHERE id = $1`, moveID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("account: update payment state for invoice %d: %w", moveID, err)
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// -- BeforeCreate Hook: Generate sequence number --
|
||||
m.BeforeCreate = func(env *orm.Environment, vals orm.Values) error {
|
||||
name, _ := vals["name"].(string)
|
||||
@@ -566,3 +843,36 @@ func initAccountBankStatement() {
|
||||
orm.Boolean("is_reconciled", orm.FieldOpts{String: "Is Reconciled"}),
|
||||
)
|
||||
}
|
||||
|
||||
// -- Helper functions for argument parsing in business methods --
|
||||
|
||||
// toInt64Arg converts various numeric types (float64, int64, int, int32) to int64.
|
||||
// Returns (value, true) on success, (0, false) if not convertible.
|
||||
func toInt64Arg(v interface{}) (int64, bool) {
|
||||
switch n := v.(type) {
|
||||
case int64:
|
||||
return n, true
|
||||
case float64:
|
||||
return int64(n), true
|
||||
case int:
|
||||
return int64(n), true
|
||||
case int32:
|
||||
return int64(n), true
|
||||
}
|
||||
return 0, false
|
||||
}
|
||||
|
||||
// floatArg extracts a float64 from an interface{}, returning defaultVal if not possible.
|
||||
func floatArg(v interface{}, defaultVal float64) float64 {
|
||||
switch n := v.(type) {
|
||||
case float64:
|
||||
return n
|
||||
case int64:
|
||||
return float64(n)
|
||||
case int:
|
||||
return float64(n)
|
||||
case int32:
|
||||
return float64(n)
|
||||
}
|
||||
return defaultVal
|
||||
}
|
||||
|
||||
70
addons/account/models/account_tax_calc.go
Normal file
70
addons/account/models/account_tax_calc.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package models
|
||||
|
||||
import "odoo-go/pkg/orm"
|
||||
|
||||
// TaxResult holds the result of computing a tax on an amount.
|
||||
type TaxResult struct {
|
||||
TaxID int64
|
||||
TaxName string
|
||||
Amount float64 // tax amount
|
||||
Base float64 // base amount (before tax)
|
||||
AccountID int64 // account to post tax to
|
||||
}
|
||||
|
||||
// ComputeTax calculates tax for a given base amount.
|
||||
// Mirrors: odoo/addons/account/models/account_tax.py AccountTax._compute_amount()
|
||||
func ComputeTax(env *orm.Environment, taxID int64, baseAmount float64) (*TaxResult, error) {
|
||||
var name string
|
||||
var amount float64
|
||||
var amountType string
|
||||
var priceInclude bool
|
||||
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT name, amount, amount_type, COALESCE(price_include, false)
|
||||
FROM account_tax WHERE id = $1`, taxID,
|
||||
).Scan(&name, &amount, &amountType, &priceInclude)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var taxAmount float64
|
||||
switch amountType {
|
||||
case "percent":
|
||||
if priceInclude {
|
||||
taxAmount = baseAmount - (baseAmount / (1 + amount/100))
|
||||
} else {
|
||||
taxAmount = baseAmount * amount / 100
|
||||
}
|
||||
case "fixed":
|
||||
taxAmount = amount
|
||||
case "division":
|
||||
if priceInclude {
|
||||
taxAmount = baseAmount - (baseAmount / (1 + amount/100))
|
||||
} else {
|
||||
taxAmount = baseAmount * amount / 100
|
||||
}
|
||||
}
|
||||
|
||||
// Find the tax account (from repartition lines)
|
||||
var accountID int64
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT COALESCE(account_id, 0) FROM account_tax_repartition_line
|
||||
WHERE tax_id = $1 AND repartition_type = 'tax' AND document_type = 'invoice'
|
||||
LIMIT 1`, taxID,
|
||||
).Scan(&accountID)
|
||||
|
||||
// Fallback: use the USt account 1776 (SKR03)
|
||||
if accountID == 0 {
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM account_account WHERE code = '1776' LIMIT 1`,
|
||||
).Scan(&accountID)
|
||||
}
|
||||
|
||||
return &TaxResult{
|
||||
TaxID: taxID,
|
||||
TaxName: name,
|
||||
Amount: taxAmount,
|
||||
Base: baseAmount,
|
||||
AccountID: accountID,
|
||||
}, nil
|
||||
}
|
||||
@@ -53,7 +53,7 @@ func initCRMLead() {
|
||||
orm.Integer("color", orm.FieldOpts{String: "Color Index"}),
|
||||
orm.Many2many("tag_ids", "crm.tag", orm.FieldOpts{String: "Tags"}),
|
||||
orm.Many2one("company_id", "res.company", orm.FieldOpts{
|
||||
String: "Company", Required: true, Index: true,
|
||||
String: "Company", Index: true,
|
||||
}),
|
||||
orm.Many2one("currency_id", "res.currency", orm.FieldOpts{String: "Currency"}),
|
||||
orm.Float("probability", orm.FieldOpts{String: "Probability (%)"}),
|
||||
@@ -66,6 +66,45 @@ func initCRMLead() {
|
||||
orm.Char("zip", orm.FieldOpts{String: "Zip"}),
|
||||
orm.Many2one("country_id", "res.country", orm.FieldOpts{String: "Country"}),
|
||||
)
|
||||
|
||||
// DefaultGet: set company_id from the session so that DB NOT NULL constraint is satisfied
|
||||
m.DefaultGet = func(env *orm.Environment, fields []string) orm.Values {
|
||||
vals := make(orm.Values)
|
||||
if env.CompanyID() > 0 {
|
||||
vals["company_id"] = env.CompanyID()
|
||||
}
|
||||
return vals
|
||||
}
|
||||
|
||||
// action_set_won: mark lead as won
|
||||
m.RegisterMethod("action_set_won", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE crm_lead SET state = 'won', probability = 100 WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// action_set_lost: mark lead as lost
|
||||
m.RegisterMethod("action_set_lost", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE crm_lead SET state = 'lost', probability = 0, active = false WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// convert_to_opportunity: lead → opportunity
|
||||
m.RegisterMethod("convert_to_opportunity", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE crm_lead SET type = 'opportunity' WHERE id = $1 AND type = 'lead'`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
}
|
||||
|
||||
// initCRMStage registers the crm.stage model.
|
||||
|
||||
@@ -1,16 +1,19 @@
|
||||
package models
|
||||
|
||||
import "odoo-go/pkg/orm"
|
||||
import (
|
||||
"fmt"
|
||||
"odoo-go/pkg/orm"
|
||||
)
|
||||
|
||||
// initFleetVehicle registers the fleet.vehicle model.
|
||||
// Mirrors: odoo/addons/fleet/models/fleet_vehicle.py
|
||||
func initFleetVehicle() {
|
||||
m := orm.NewModel("fleet.vehicle", orm.ModelOpts{
|
||||
vehicle := orm.NewModel("fleet.vehicle", orm.ModelOpts{
|
||||
Description: "Vehicle",
|
||||
Order: "license_plate asc, name asc",
|
||||
})
|
||||
|
||||
m.AddFields(
|
||||
vehicle.AddFields(
|
||||
orm.Char("name", orm.FieldOpts{String: "Name", Compute: "_compute_vehicle_name", Store: true}),
|
||||
orm.Char("license_plate", orm.FieldOpts{String: "License Plate", Required: true, Index: true}),
|
||||
orm.Char("vin_sn", orm.FieldOpts{String: "Chassis Number", Help: "Unique vehicle identification number (VIN)"}),
|
||||
@@ -57,6 +60,42 @@ func initFleetVehicle() {
|
||||
orm.One2many("log_services", "fleet.vehicle.log.services", "vehicle_id", orm.FieldOpts{String: "Services"}),
|
||||
orm.Boolean("active", orm.FieldOpts{String: "Active", Default: true}),
|
||||
)
|
||||
|
||||
// action_accept: set vehicle state to active
|
||||
vehicle.RegisterMethod("action_accept", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
// Find or create 'active' state
|
||||
var stateID int64
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM fleet_vehicle_state WHERE name = 'Active' LIMIT 1`).Scan(&stateID)
|
||||
if stateID > 0 {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE fleet_vehicle SET state_id = $1 WHERE id = $2`, stateID, id)
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// log_odometer: record an odometer reading
|
||||
vehicle.RegisterMethod("log_odometer", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
if len(args) < 1 {
|
||||
return nil, fmt.Errorf("fleet: odometer value required")
|
||||
}
|
||||
value, ok := args[0].(float64)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("fleet: invalid odometer value")
|
||||
}
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`INSERT INTO fleet_vehicle_odometer (vehicle_id, value, date) VALUES ($1, $2, NOW())`,
|
||||
id, value)
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE fleet_vehicle SET odometer = $1 WHERE id = $2`, value, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
}
|
||||
|
||||
// initFleetVehicleModel registers the fleet.vehicle.model model.
|
||||
|
||||
@@ -92,6 +92,16 @@ func initHREmployee() {
|
||||
orm.Integer("km_home_work", orm.FieldOpts{String: "Home-Work Distance (km)"}),
|
||||
orm.Binary("image_1920", orm.FieldOpts{String: "Image"}),
|
||||
)
|
||||
|
||||
// toggle_active: archive/unarchive employee
|
||||
m.RegisterMethod("toggle_active", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE hr_employee SET active = NOT active WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
}
|
||||
|
||||
// initHRDepartment registers the hr.department model.
|
||||
|
||||
42
addons/l10n_de/din5008.go
Normal file
42
addons/l10n_de/din5008.go
Normal file
@@ -0,0 +1,42 @@
|
||||
package l10n_de
|
||||
|
||||
import "fmt"
|
||||
|
||||
// DIN5008Config holds the German business letter format configuration.
|
||||
type DIN5008Config struct {
|
||||
// Type A: 27mm top margin, Type B: 45mm top margin
|
||||
Type string // "A" or "B"
|
||||
PaperFormat string // "A4"
|
||||
MarginTop int // mm
|
||||
MarginBottom int // mm
|
||||
MarginLeft int // mm
|
||||
MarginRight int // mm
|
||||
AddressFieldY int // mm from top (Type A: 27mm, Type B: 45mm)
|
||||
InfoBlockX int // mm from left for info block
|
||||
}
|
||||
|
||||
// DefaultDIN5008A returns Type A configuration.
|
||||
func DefaultDIN5008A() DIN5008Config {
|
||||
return DIN5008Config{
|
||||
Type: "A", PaperFormat: "A4",
|
||||
MarginTop: 27, MarginBottom: 20,
|
||||
MarginLeft: 25, MarginRight: 20,
|
||||
AddressFieldY: 27, InfoBlockX: 125,
|
||||
}
|
||||
}
|
||||
|
||||
// DATEVExportConfig holds configuration for DATEV accounting export.
|
||||
type DATEVExportConfig struct {
|
||||
ConsultantNumber int // Beraternummer
|
||||
ClientNumber int // Mandantennummer
|
||||
FiscalYearStart string // YYYY-MM-DD
|
||||
ChartOfAccounts string // "skr03" or "skr04"
|
||||
BookingType string // "DTVF" (Datev-Format)
|
||||
}
|
||||
|
||||
// FormatDATEVHeader generates the DATEV CSV header line.
|
||||
func FormatDATEVHeader(cfg DATEVExportConfig) string {
|
||||
return "\"EXTF\";700;21;\"Buchungsstapel\";7;;" +
|
||||
fmt.Sprintf("%d;%d;", cfg.ConsultantNumber, cfg.ClientNumber) +
|
||||
cfg.FiscalYearStart + ";" + "4" + ";;" // 4 = length of fiscal year
|
||||
}
|
||||
@@ -1,6 +1,9 @@
|
||||
package models
|
||||
|
||||
import "odoo-go/pkg/orm"
|
||||
import (
|
||||
"fmt"
|
||||
"odoo-go/pkg/orm"
|
||||
)
|
||||
|
||||
// initProjectProject registers the project.project model.
|
||||
// Mirrors: odoo/addons/project/models/project_project.py
|
||||
@@ -34,12 +37,12 @@ func initProjectProject() {
|
||||
// initProjectTask registers the project.task model.
|
||||
// Mirrors: odoo/addons/project/models/project_task.py
|
||||
func initProjectTask() {
|
||||
m := orm.NewModel("project.task", orm.ModelOpts{
|
||||
task := orm.NewModel("project.task", orm.ModelOpts{
|
||||
Description: "Task",
|
||||
Order: "priority desc, sequence, id desc",
|
||||
})
|
||||
|
||||
m.AddFields(
|
||||
task.AddFields(
|
||||
orm.Char("name", orm.FieldOpts{String: "Title", Required: true, Index: true}),
|
||||
orm.HTML("description", orm.FieldOpts{String: "Description"}),
|
||||
orm.Boolean("active", orm.FieldOpts{String: "Active", Default: true}),
|
||||
@@ -75,6 +78,48 @@ func initProjectTask() {
|
||||
{Value: "line_note", Label: "Note"},
|
||||
}, orm.FieldOpts{String: "Display Type"}),
|
||||
)
|
||||
|
||||
// DefaultGet: set company_id from session
|
||||
task.DefaultGet = func(env *orm.Environment, fields []string) orm.Values {
|
||||
vals := make(orm.Values)
|
||||
if env.CompanyID() > 0 {
|
||||
vals["company_id"] = env.CompanyID()
|
||||
}
|
||||
return vals
|
||||
}
|
||||
|
||||
// action_done: mark task as done
|
||||
task.RegisterMethod("action_done", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE project_task SET state = 'done' WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// action_cancel: mark task as cancelled
|
||||
task.RegisterMethod("action_cancel", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE project_task SET state = 'cancel' WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// action_reopen: reopen a cancelled/done task
|
||||
task.RegisterMethod("action_reopen", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE project_task SET state = 'open' WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// Ensure fmt is used
|
||||
_ = fmt.Sprintf
|
||||
}
|
||||
|
||||
// initProjectTaskType registers the project.task.type model (stages).
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
package models
|
||||
|
||||
import "odoo-go/pkg/orm"
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"odoo-go/pkg/orm"
|
||||
)
|
||||
|
||||
// initPurchaseOrder registers purchase.order and purchase.order.line.
|
||||
// Mirrors: odoo/addons/purchase/models/purchase_order.py
|
||||
@@ -37,7 +42,7 @@ func initPurchaseOrder() {
|
||||
String: "Vendor", Required: true, Index: true,
|
||||
}),
|
||||
orm.Datetime("date_order", orm.FieldOpts{
|
||||
String: "Order Deadline", Required: true, Index: true,
|
||||
String: "Order Deadline", Required: true, Index: true, Default: "today",
|
||||
}),
|
||||
orm.Datetime("date_planned", orm.FieldOpts{
|
||||
String: "Expected Arrival",
|
||||
@@ -102,6 +107,147 @@ func initPurchaseOrder() {
|
||||
orm.Char("origin", orm.FieldOpts{String: "Source Document"}),
|
||||
)
|
||||
|
||||
// button_confirm: draft → purchase
|
||||
m.RegisterMethod("button_confirm", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
var state string
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT state FROM purchase_order WHERE id = $1`, id).Scan(&state)
|
||||
if state != "draft" && state != "sent" {
|
||||
return nil, fmt.Errorf("purchase: can only confirm draft orders")
|
||||
}
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE purchase_order SET state = 'purchase', date_approve = NOW() WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// button_cancel
|
||||
m.RegisterMethod("button_cancel", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE purchase_order SET state = 'cancel' WHERE id = $1`, id)
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// action_create_bill: Generate a vendor bill (account.move in_invoice) from a confirmed PO.
|
||||
// Mirrors: odoo/addons/purchase/models/purchase_order.py PurchaseOrder.action_create_invoice()
|
||||
m.RegisterMethod("action_create_bill", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
var billIDs []int64
|
||||
|
||||
for _, poID := range rs.IDs() {
|
||||
var partnerID, companyID, currencyID int64
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT partner_id, company_id, currency_id FROM purchase_order WHERE id = $1`,
|
||||
poID).Scan(&partnerID, &companyID, ¤cyID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("purchase: read PO %d for bill: %w", poID, err)
|
||||
}
|
||||
|
||||
// Find purchase journal
|
||||
var journalID int64
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM account_journal WHERE type = 'purchase' AND company_id = $1 LIMIT 1`,
|
||||
companyID).Scan(&journalID)
|
||||
if journalID == 0 {
|
||||
// Fallback: first available journal
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM account_journal WHERE company_id = $1 ORDER BY id LIMIT 1`,
|
||||
companyID).Scan(&journalID)
|
||||
}
|
||||
|
||||
// Read PO lines to generate invoice lines
|
||||
rows, err := env.Tx().Query(env.Ctx(),
|
||||
`SELECT COALESCE(name,''), COALESCE(product_qty,1), COALESCE(price_unit,0), COALESCE(discount,0)
|
||||
FROM purchase_order_line
|
||||
WHERE order_id = $1 ORDER BY sequence, id`, poID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("purchase: read PO lines %d: %w", poID, err)
|
||||
}
|
||||
|
||||
type poLine struct {
|
||||
name string
|
||||
qty float64
|
||||
price float64
|
||||
discount float64
|
||||
}
|
||||
var lines []poLine
|
||||
for rows.Next() {
|
||||
var l poLine
|
||||
if err := rows.Scan(&l.name, &l.qty, &l.price, &l.discount); err != nil {
|
||||
rows.Close()
|
||||
return nil, err
|
||||
}
|
||||
lines = append(lines, l)
|
||||
}
|
||||
rows.Close()
|
||||
|
||||
// Create the vendor bill
|
||||
var billID int64
|
||||
err = env.Tx().QueryRow(env.Ctx(),
|
||||
`INSERT INTO account_move
|
||||
(name, move_type, state, date, partner_id, journal_id, company_id, currency_id, invoice_origin)
|
||||
VALUES ('/', 'in_invoice', 'draft', NOW(), $1, $2, $3, $4, $5) RETURNING id`,
|
||||
partnerID, journalID, companyID, currencyID,
|
||||
fmt.Sprintf("PO%d", poID)).Scan(&billID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("purchase: create bill for PO %d: %w", poID, err)
|
||||
}
|
||||
|
||||
// Try to generate a proper sequence name
|
||||
seq, seqErr := orm.NextByCode(env, "account.move.in_invoice")
|
||||
if seqErr != nil {
|
||||
seq, seqErr = orm.NextByCode(env, "account.move")
|
||||
}
|
||||
if seqErr == nil && seq != "" {
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE account_move SET name = $1 WHERE id = $2`, seq, billID)
|
||||
}
|
||||
|
||||
// Create invoice lines for each PO line
|
||||
for _, l := range lines {
|
||||
subtotal := l.qty * l.price * (1 - l.discount/100)
|
||||
env.Tx().Exec(env.Ctx(),
|
||||
`INSERT INTO account_move_line
|
||||
(move_id, name, quantity, price_unit, discount, debit, credit, balance,
|
||||
display_type, company_id, journal_id, account_id)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, 0, $6, 'product', $7, $8,
|
||||
COALESCE((SELECT id FROM account_account WHERE company_id = $7 LIMIT 1), 1))`,
|
||||
billID, l.name, l.qty, l.price, l.discount, subtotal,
|
||||
companyID, journalID)
|
||||
}
|
||||
|
||||
billIDs = append(billIDs, billID)
|
||||
|
||||
// Update PO invoice_status
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE purchase_order SET invoice_status = 'invoiced' WHERE id = $1`, poID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("purchase: update invoice status for PO %d: %w", poID, err)
|
||||
}
|
||||
}
|
||||
return billIDs, nil
|
||||
})
|
||||
|
||||
// BeforeCreate: auto-assign sequence number
|
||||
m.BeforeCreate = func(env *orm.Environment, vals orm.Values) error {
|
||||
name, _ := vals["name"].(string)
|
||||
if name == "" || name == "/" || name == "New" {
|
||||
seq, err := orm.NextByCode(env, "purchase.order")
|
||||
if err != nil {
|
||||
// Fallback: generate a simple name
|
||||
vals["name"] = fmt.Sprintf("PO/%d", time.Now().UnixNano()%100000)
|
||||
} else {
|
||||
vals["name"] = seq
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// purchase.order.line — individual line items on a PO
|
||||
initPurchaseOrderLine()
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package models
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"odoo-go/pkg/orm"
|
||||
)
|
||||
@@ -43,7 +44,7 @@ func initSaleOrder() {
|
||||
// -- Dates --
|
||||
m.AddFields(
|
||||
orm.Datetime("date_order", orm.FieldOpts{
|
||||
String: "Order Date", Required: true, Index: true,
|
||||
String: "Order Date", Required: true, Index: true, Default: "today",
|
||||
}),
|
||||
orm.Date("validity_date", orm.FieldOpts{String: "Expiration"}),
|
||||
)
|
||||
@@ -111,6 +112,50 @@ func initSaleOrder() {
|
||||
orm.Boolean("require_payment", orm.FieldOpts{String: "Online Payment"}),
|
||||
)
|
||||
|
||||
// -- Computed: _compute_amounts --
|
||||
// Computes untaxed, tax, and total amounts from order lines.
|
||||
// Mirrors: odoo/addons/sale/models/sale_order.py SaleOrder._compute_amounts()
|
||||
computeSaleAmounts := func(rs *orm.Recordset) (orm.Values, error) {
|
||||
env := rs.Env()
|
||||
soID := rs.IDs()[0]
|
||||
|
||||
var untaxed float64
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT COALESCE(SUM(product_uom_qty * price_unit * (1 - COALESCE(discount,0)/100)), 0)
|
||||
FROM sale_order_line WHERE order_id = $1
|
||||
AND (display_type IS NULL OR display_type = '' OR display_type = 'product')`,
|
||||
soID).Scan(&untaxed)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("sale: compute amounts for SO %d: %w", soID, err)
|
||||
}
|
||||
|
||||
// Compute tax from linked tax records on lines; fall back to sum of line taxes
|
||||
var tax float64
|
||||
err = env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT COALESCE(SUM(
|
||||
product_uom_qty * price_unit * (1 - COALESCE(discount,0)/100)
|
||||
* COALESCE((SELECT t.amount / 100 FROM account_tax t
|
||||
JOIN sale_order_line_account_tax_rel rel ON rel.account_tax_id = t.id
|
||||
WHERE rel.sale_order_line_id = sol.id LIMIT 1), 0)
|
||||
), 0)
|
||||
FROM sale_order_line sol WHERE sol.order_id = $1
|
||||
AND (sol.display_type IS NULL OR sol.display_type = '' OR sol.display_type = 'product')`,
|
||||
soID).Scan(&tax)
|
||||
if err != nil {
|
||||
// Fallback: if the M2M table doesn't exist, estimate tax at 0
|
||||
tax = 0
|
||||
}
|
||||
|
||||
return orm.Values{
|
||||
"amount_untaxed": untaxed,
|
||||
"amount_tax": tax,
|
||||
"amount_total": untaxed + tax,
|
||||
}, nil
|
||||
}
|
||||
m.RegisterCompute("amount_untaxed", computeSaleAmounts)
|
||||
m.RegisterCompute("amount_tax", computeSaleAmounts)
|
||||
m.RegisterCompute("amount_total", computeSaleAmounts)
|
||||
|
||||
// -- Sequence Hook --
|
||||
m.BeforeCreate = func(env *orm.Environment, vals orm.Values) error {
|
||||
name, _ := vals["name"].(string)
|
||||
@@ -234,7 +279,7 @@ func initSaleOrder() {
|
||||
"currency_id": currencyID,
|
||||
"journal_id": journalID,
|
||||
"invoice_origin": fmt.Sprintf("SO%d", soID),
|
||||
"date": "2026-03-30", // TODO: use current date
|
||||
"date": time.Now().Format("2006-01-02"),
|
||||
"line_ids": lineCmds,
|
||||
})
|
||||
if err != nil {
|
||||
@@ -250,6 +295,109 @@ func initSaleOrder() {
|
||||
|
||||
return invoiceIDs, nil
|
||||
})
|
||||
|
||||
// action_create_delivery: Generate a stock picking (delivery) from a confirmed sale order.
|
||||
// Mirrors: odoo/addons/sale/models/sale_order.py SaleOrder._action_confirm() → _create_picking()
|
||||
m.RegisterMethod("action_create_delivery", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
var pickingIDs []int64
|
||||
|
||||
for _, soID := range rs.IDs() {
|
||||
// Read SO header for partner and company
|
||||
var partnerID, companyID int64
|
||||
var soName string
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT COALESCE(partner_shipping_id, partner_id), company_id, name
|
||||
FROM sale_order WHERE id = $1`, soID,
|
||||
).Scan(&partnerID, &companyID, &soName)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("sale: read SO %d for delivery: %w", soID, err)
|
||||
}
|
||||
|
||||
// Read SO lines with products
|
||||
rows, err := env.Tx().Query(env.Ctx(),
|
||||
`SELECT product_id, product_uom_qty, COALESCE(name, '') FROM sale_order_line
|
||||
WHERE order_id = $1 AND product_id IS NOT NULL
|
||||
AND (display_type IS NULL OR display_type = '' OR display_type = 'product')`, soID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("sale: read SO lines %d for delivery: %w", soID, err)
|
||||
}
|
||||
|
||||
type soline struct {
|
||||
productID int64
|
||||
qty float64
|
||||
name string
|
||||
}
|
||||
var lines []soline
|
||||
for rows.Next() {
|
||||
var l soline
|
||||
if err := rows.Scan(&l.productID, &l.qty, &l.name); err != nil {
|
||||
rows.Close()
|
||||
return nil, err
|
||||
}
|
||||
lines = append(lines, l)
|
||||
}
|
||||
rows.Close()
|
||||
if len(lines) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
// Find outgoing picking type and locations
|
||||
var pickingTypeID, srcLocID, destLocID int64
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT pt.id, COALESCE(pt.default_location_src_id, 0), COALESCE(pt.default_location_dest_id, 0)
|
||||
FROM stock_picking_type pt
|
||||
WHERE pt.code = 'outgoing' AND pt.company_id = $1
|
||||
LIMIT 1`, companyID,
|
||||
).Scan(&pickingTypeID, &srcLocID, &destLocID)
|
||||
|
||||
// Fallback: find internal and customer locations
|
||||
if srcLocID == 0 {
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM stock_location WHERE usage = 'internal' AND COALESCE(company_id, $1) = $1 LIMIT 1`,
|
||||
companyID).Scan(&srcLocID)
|
||||
}
|
||||
if destLocID == 0 {
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM stock_location WHERE usage = 'customer' LIMIT 1`).Scan(&destLocID)
|
||||
}
|
||||
if pickingTypeID == 0 {
|
||||
env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT id FROM stock_picking_type WHERE code = 'outgoing' LIMIT 1`).Scan(&pickingTypeID)
|
||||
}
|
||||
|
||||
// Create picking
|
||||
var pickingID int64
|
||||
err = env.Tx().QueryRow(env.Ctx(),
|
||||
`INSERT INTO stock_picking
|
||||
(name, state, scheduled_date, company_id, partner_id, picking_type_id,
|
||||
location_id, location_dest_id, origin)
|
||||
VALUES ($1, 'confirmed', NOW(), $2, $3, $4, $5, $6, $7) RETURNING id`,
|
||||
fmt.Sprintf("WH/OUT/%05d", soID), companyID, partnerID, pickingTypeID,
|
||||
srcLocID, destLocID, soName,
|
||||
).Scan(&pickingID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("sale: create picking for SO %d: %w", soID, err)
|
||||
}
|
||||
|
||||
// Create stock moves
|
||||
for _, l := range lines {
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`INSERT INTO stock_move
|
||||
(name, product_id, product_uom_qty, state, picking_id, company_id,
|
||||
location_id, location_dest_id, date, origin, product_uom)
|
||||
VALUES ($1, $2, $3, 'confirmed', $4, $5, $6, $7, NOW(), $8, 1)`,
|
||||
l.name, l.productID, l.qty, pickingID, companyID,
|
||||
srcLocID, destLocID, soName)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("sale: create stock move for SO %d: %w", soID, err)
|
||||
}
|
||||
}
|
||||
|
||||
pickingIDs = append(pickingIDs, pickingID)
|
||||
}
|
||||
return pickingIDs, nil
|
||||
})
|
||||
}
|
||||
|
||||
// initSaleOrderLine registers sale.order.line — individual line items on a sales order.
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
package models
|
||||
|
||||
import "odoo-go/pkg/orm"
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"odoo-go/pkg/orm"
|
||||
)
|
||||
|
||||
// initStock registers all stock models.
|
||||
// Mirrors: odoo/addons/stock/models/stock_warehouse.py,
|
||||
@@ -168,6 +173,150 @@ func initStockPicking() {
|
||||
orm.Text("note", orm.FieldOpts{String: "Notes"}),
|
||||
orm.Char("origin", orm.FieldOpts{String: "Source Document", Index: true}),
|
||||
)
|
||||
|
||||
// --- BeforeCreate hook: auto-generate picking reference ---
|
||||
// Mirrors: stock.picking._create_sequence() / ir.sequence
|
||||
m.BeforeCreate = func(env *orm.Environment, vals orm.Values) error {
|
||||
name, _ := vals["name"].(string)
|
||||
if name == "" || name == "/" {
|
||||
vals["name"] = fmt.Sprintf("WH/IN/%05d", time.Now().UnixNano()%100000)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// --- Business methods: stock move workflow ---
|
||||
|
||||
// action_confirm transitions a picking from draft → confirmed.
|
||||
// Confirms all associated stock moves that are still in draft.
|
||||
// Mirrors: stock.picking.action_confirm()
|
||||
m.RegisterMethod("action_confirm", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
var state string
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT state FROM stock_picking WHERE id = $1`, id).Scan(&state)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: cannot read picking %d: %w", id, err)
|
||||
}
|
||||
if state != "draft" {
|
||||
return nil, fmt.Errorf("stock: can only confirm draft pickings (picking %d is %q)", id, state)
|
||||
}
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE stock_picking SET state = 'confirmed' WHERE id = $1`, id)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: confirm picking %d: %w", id, err)
|
||||
}
|
||||
// Also confirm all draft moves on this picking
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE stock_move SET state = 'confirmed' WHERE picking_id = $1 AND state = 'draft'`, id)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: confirm moves for picking %d: %w", id, err)
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// action_assign transitions a picking from confirmed → assigned (reserve stock).
|
||||
// Mirrors: stock.picking.action_assign()
|
||||
m.RegisterMethod("action_assign", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
_, err := env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE stock_picking SET state = 'assigned' WHERE id = $1`, id)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: assign picking %d: %w", id, err)
|
||||
}
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE stock_move SET state = 'assigned' WHERE picking_id = $1 AND state IN ('confirmed', 'partially_available')`, id)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: assign moves for picking %d: %w", id, err)
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
|
||||
// button_validate transitions a picking from assigned → done (process the transfer).
|
||||
// Updates all moves to done and adjusts stock quants (source decremented, dest incremented).
|
||||
// Mirrors: stock.picking.button_validate()
|
||||
m.RegisterMethod("button_validate", func(rs *orm.Recordset, args ...interface{}) (interface{}, error) {
|
||||
env := rs.Env()
|
||||
for _, id := range rs.IDs() {
|
||||
// Mark picking as done
|
||||
_, err := env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE stock_picking SET state = 'done', date_done = NOW() WHERE id = $1`, id)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: validate picking %d: %w", id, err)
|
||||
}
|
||||
// Mark all moves as done
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE stock_move SET state = 'done', date = NOW() WHERE picking_id = $1`, id)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: validate moves for picking %d: %w", id, err)
|
||||
}
|
||||
|
||||
// Update quants: for each done move, adjust source and destination locations
|
||||
rows, err := env.Tx().Query(env.Ctx(),
|
||||
`SELECT product_id, product_uom_qty, location_id, location_dest_id
|
||||
FROM stock_move WHERE picking_id = $1 AND state = 'done'`, id)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stock: read moves for picking %d: %w", id, err)
|
||||
}
|
||||
|
||||
type moveInfo struct {
|
||||
productID int64
|
||||
qty float64
|
||||
srcLoc int64
|
||||
dstLoc int64
|
||||
}
|
||||
var moves []moveInfo
|
||||
for rows.Next() {
|
||||
var mi moveInfo
|
||||
if err := rows.Scan(&mi.productID, &mi.qty, &mi.srcLoc, &mi.dstLoc); err != nil {
|
||||
rows.Close()
|
||||
return nil, fmt.Errorf("stock: scan move for picking %d: %w", id, err)
|
||||
}
|
||||
moves = append(moves, mi)
|
||||
}
|
||||
rows.Close()
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, fmt.Errorf("stock: iterate moves for picking %d: %w", id, err)
|
||||
}
|
||||
|
||||
for _, mi := range moves {
|
||||
// Decrease source location quant
|
||||
if err := updateQuant(env, mi.productID, mi.srcLoc, -mi.qty); err != nil {
|
||||
return nil, fmt.Errorf("stock: update source quant for picking %d: %w", id, err)
|
||||
}
|
||||
// Increase destination location quant
|
||||
if err := updateQuant(env, mi.productID, mi.dstLoc, mi.qty); err != nil {
|
||||
return nil, fmt.Errorf("stock: update dest quant for picking %d: %w", id, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
return true, nil
|
||||
})
|
||||
}
|
||||
|
||||
// updateQuant adjusts the on-hand quantity for a product at a location.
|
||||
// If no quant row exists yet it inserts one; otherwise it updates in place.
|
||||
func updateQuant(env *orm.Environment, productID, locationID int64, delta float64) error {
|
||||
var exists bool
|
||||
err := env.Tx().QueryRow(env.Ctx(),
|
||||
`SELECT EXISTS(SELECT 1 FROM stock_quant WHERE product_id = $1 AND location_id = $2)`,
|
||||
productID, locationID).Scan(&exists)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if exists {
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`UPDATE stock_quant SET quantity = quantity + $1 WHERE product_id = $2 AND location_id = $3`,
|
||||
delta, productID, locationID)
|
||||
} else {
|
||||
_, err = env.Tx().Exec(env.Ctx(),
|
||||
`INSERT INTO stock_quant (product_id, location_id, quantity, company_id) VALUES ($1, $2, $3, 1)`,
|
||||
productID, locationID, delta)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// initStockMove registers stock.move — individual product movements.
|
||||
|
||||
Reference in New Issue
Block a user