-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-# $Id$
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
##############################################################################
import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
import netsvc
from osv import fields, osv
-from mx import DateTime
from tools.translate import _
from decimal import Decimal
-import tools
-import re
-
+import decimal_precision as dp
class pos_config_journal(osv.osv):
-
""" Point of Sale journal configuration"""
-
_name = 'pos.config.journal'
- _description = "Point of Sale journal configuration"
+ _description = "Journal Configuration"
_columns = {
'name': fields.char('Description', size=64),
'code': fields.char('Code', size=64),
}
pos_config_journal()
+
class pos_company_discount(osv.osv):
-
- """ Company Discount and Cashboxes """
-
+ """ Company Discount and Cashboxes """
_inherit = 'res.company'
_columns = {
- 'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
- 'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
- }
+ 'company_discount': fields.float('Max Discount(%)', digits_compute=dp.get_precision('Point Of Sale')),
+ 'max_diff': fields.float('Max Difference for Cashboxes', digits_compute=dp.get_precision('Point Of Sale Discount')),
+ }
pos_company_discount()
class pos_order(osv.osv):
-
""" Point of sale gives business owners a convenient way of checking out customers
- and of recording sales """
-
+ and of recording sales """
+
_name = "pos.order"
_description = "Point of Sale"
_order = "date_order, create_date desc"
- _order = "date_order desc"
-
- def unlink(self, cr, uid, ids, context={}):
-
+ def unlink(self, cr, uid, ids, context=None):
for rec in self.browse(cr, uid, ids, context=context):
for rec_statement in rec.statement_ids:
- if (rec_statement.statement_id and rec_statement.statement_id.state=='confirm') or rec.state=='done':
+ if (rec_statement.statement_id and rec_statement.statement_id.state == 'confirm') or rec.state == 'done':
raise osv.except_osv(_('Invalid action !'), _('Cannot delete a point of sale which is closed or contains confirmed cashboxes!'))
return super(pos_order, self).unlink(cr, uid, ids, context=context)
- def onchange_partner_pricelist(self, cr, uid, ids, part, context={}):
-
+ def onchange_partner_pricelist(self, cr, uid, ids, part, context=None):
""" Changed price list on_change of partner_id"""
-
if not part:
return {}
- pricelist = self.pool.get('res.partner').browse(cr, uid, part).property_product_pricelist.id
- return {'value':{'pricelist_id': pricelist}}
-
- def _amount_total(self, cr, uid, ids, field_name, arg, context):
+ pricelist = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_product_pricelist.id
+ return {'value': {'pricelist_id': pricelist}}
+ def _amount_total(self, cr, uid, ids, field_name, arg, context=None):
""" Calculates amount_tax of order line
@param field_names: Names of fields.
@return: Dictionary of values """
-
cr.execute("""
- SELECT
- p.id,
- COALESCE(SUM(
- l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0
- ) AS amount
- FROM pos_order p
- LEFT OUTER JOIN pos_order_line l ON (p.id=l.order_id)
- WHERE p.id =ANY(%s) GROUP BY p.id """,(ids,))
+ SELECT
+ p.id,
+ COALESCE(SUM(
+ l.price_unit*l.qty*(1-(l.discount/100.0)))::decimal(16,2), 0
+ ) AS amount
+ FROM pos_order p
+ LEFT OUTER JOIN pos_order_line l ON (p.id = l.order_id)
+ WHERE p.id IN %s GROUP BY p.id """,(tuple(ids),))
res = dict(cr.fetchall())
- for rec in self.browse(cr, uid, ids, context):
+ for rec in self.browse(cr, uid, ids, context=context):
if rec.partner_id \
and rec.partner_id.property_account_position \
and rec.partner_id.property_account_position.tax_ids:
return res
def _get_date_payment2(self, cr, uid, ids, context, *a):
-
- # Todo need to check this function
+ # Todo need to check this function
""" Find payment Date
-
@param field_names: Names of fields.
@return: Dictionary of values """
-
res = {}
- pay_obj = self.pool.get('account.bank.statement')
- stat_obj_line = self.pool.get('account.bank.statement.line')
- tot =0.0
- val=None
+ val = None
for order in self.browse(cr, uid, ids):
- if order.date_payment:
- res[order.id]=order.date_payment
+ cr.execute("SELECT date_payment FROM pos_order WHERE id = %s", (order.id,))
+ date_p=cr.fetchone()
+ date_p=date_p and date_p[0] or None
+ if date_p:
+ res[order.id]=date_p
return res
- cr.execute(" SELECT max(l.date) from account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o where i.move_id=m.id and l.move_id=m.id and l.reconcile_id=r.id and o.id=%d and o.invoice_id=i.id"%(order.id))
- val=cr.fetchone()
- val= val and val[0] or None
- if not val:
- cr.execute("select max(date) from account_bank_statement_line l, account_bank_statement_reconcile s where l.pos_statement_id=%d and l.reconcile_id=s.id"%(order.id))
- val=cr.fetchone()
- val=val and val[0] or None
+ cr.execute(" SELECT MAX(l.date) "
+ " FROM account_move_line l, account_move m, account_invoice i, account_move_reconcile r, pos_order o "
+ " WHERE i.move_id = m.id AND l.move_id = m.id AND l.reconcile_id = r.id AND o.id = %s AND o.invoice_id = i.id",
+ (order.id,))
+ val = cr.fetchone()
+ val = val and val[0] or None
if val:
- res[order.id]=val
+ res[order.id] = val
return res
-
+
def _get_date_payment(self, cr, uid, ids, context, *a):
-
""" Find Validation Date
- @return: Dictionary of values """
-
+ @return: Dictionary of values """
res = {}
- pay_obj = self.pool.get('pos.payment')
- tot =0.0
- val=None
+ val = None
for order in self.browse(cr, uid, ids):
- if order.date_validation:
- res[order.id]=order.date_validation
+ cr.execute("SELECT date_validation FROM pos_order WHERE id = %s", (order.id,))
+ date_p = cr.fetchone()
+ date_p = date_p and date_p[0] or None
+ if date_p:
+ res[order.id] = date_p
return res
- discount_allowed=order.company_id.company_discount
+ discount_allowed = order.company_id.company_discount
for line in order.lines:
if line.discount > discount_allowed:
return {order.id: None }
- if order.amount_paid == order.amount_total and not order.date_validation:
- cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
- val=cr.fetchone()
- val=val and val[0] or None
- if order.invoice_id and order.invoice_id.move_id and not order.date_validation and not val:
+ if order.amount_paid == order.amount_total and not date_p:
+ cr.execute("SELECT MAX(date) FROM account_bank_statement_line WHERE pos_statement_id = %s", (order.id,))
+ val = cr.fetchone()
+ val = val and val[0] or None
+ if order.invoice_id and order.invoice_id.move_id and not date_p and not val:
for o in order.invoice_id.move_id.line_id:
- if o.balance==0:
- if val<o.date_created:
- val=o.date_created
+ if o.balance == 0:
+ if val < o.date_created:
+ val = o.date_created
if val:
- res[order.id]=val
+ res[order.id] = val
return res
- def _amount_tax(self, cr, uid, ids, field_name, arg, context):
-
- """ Calculates Taxes of order
- @return: Dictionary of values """
-
- res = {}
+ def _amount_all(self, cr, uid, ids, name, args, context=None):
tax_obj = self.pool.get('account.tax')
- for order in self.browse(cr, uid, ids):
+ cur_obj = self.pool.get('res.currency')
+ res = {}
+ for order in self.browse(cr, uid, ids, context=context):
+ res[order.id] = {
+ 'amount_paid': 0.0,
+ 'amount_return':0.0,
+ 'amount_tax':0.0,
+ }
val = 0.0
+ cur = order.pricelist_id.currency_id
+ for payment in order.statement_ids:
+ res[order.id]['amount_paid'] += payment.amount
+ res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
for line in order.lines:
- if order.price_type!='tax_excluded':
- val = reduce(lambda x, y: x+round(y['amount'], 2),
+ if order.price_type != 'tax_excluded':
+ res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
line.price_unit * \
(1-(line.discount or 0.0)/100.0), line.qty),
- val)
- else:
- val = reduce(lambda x, y: x+round(y['amount'], 2),
- tax_obj.compute(cr, uid, line.product_id.taxes_id,
- line.price_unit * \
- (1-(line.discount or 0.0)/100.0), line.qty),
- val)
-
- res[order.id] = val
+ res[order.id]['amount_tax'])
+ elif line.qty != 0.0:
+ for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.qty, line.product_id, line.order_id.partner_id)['taxes']:
+ val += c.get('amount', 0.0)
+ res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
return res
- def _total_payment(self, cr, uid, ids, field_name, arg, context):
-
- """ Calculates Total payment of order
- @return: Dictionary of values """
-
- res = {}
- i=0
- for order in self.browse(cr, uid, ids):
- val = 0.0
- for payment in order.statement_ids:
- val += payment.amount
- res[order.id] = val
- return res
- return {order.id:val}
-
- def _total_return(self, cr, uid, ids, field_name, arg, context):
-
- """ Calculates Total Returned from the order
- @return: Dictionary of values """
-
- res = {}
- for order in self.browse(cr, uid, ids):
- val = 0.0
- for payment in order.payments:
- val += (payment.amount < 0 and payment.amount or 0)
- res[order.id] = val
- return res
- def _sale_journal_get(self, cr, uid, context):
-
- """ To get sale journal for this order"
- @return: journal """
-
+ def _sale_journal_get(self, cr, uid, context=None):
+ """ To get sale journal for this order"
+ @return: journal """
journal_obj = self.pool.get('account.journal')
- res = journal_obj.search(cr, uid,
- [('type', '=', 'sale')], limit=1)
- if res:
- return res[0]
- else:
- return False
+ res = journal_obj.search(cr, uid, [('type', '=', 'sale')], limit=1)
+ return res and res[0] or False
- def _shop_get(self, cr, uid, context):
-
- """ To get Shop for this order"
- @return: Shop id """
-
- company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+ def _shop_get(self, cr, uid, context=None):
+ """ To get Shop for this order"
+ @return: Shop id """
res = self.pool.get('sale.shop').search(cr, uid, [])
- if res:
- return res[0]
- else:
- return False
- def copy(self, cr, uid, id, default=None, context={}):
-
+ return res and res[0] or False
+
+ def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
default.update({
'state': 'draft',
- 'payments': [],
'partner_id': False,
'invoice_id': False,
'account_move': False,
- 'last_out_picking': False,
+ 'picking_id': False,
+ 'statement_ids': [],
'nb_print': 0,
'pickings': []
})
- return super(pos_order, self).copy(cr, uid, id, default, context)
+ return super(pos_order, self).copy(cr, uid, id, default, context=context)
- def _get_v( self, cr, uid, ids,*a):
-
+ def _get_v( self, cr, uid, ids, *a):
""" Changed the Validation state of order
@return: State """
-
- flag=False
- res_company = self.pool.get('res.company')
res_obj = self.pool.get('res.users')
- res=0.0
- res2=0.0
- statement_obj = self.pool.get('account.bank.statement.line')
- obj_journal = self.pool.get('account.journal')
- company_disc=self.browse(cr,uid,ids)
+ company_disc = self.browse(cr, uid, ids)
+ list_jrnl = []
+ r = {}
if not company_disc:
- comp=res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
+ comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0
else:
- comp= company_disc[0] and company_disc[0].company_id and company_disc[0].company_id.company_discount or 0.0
- for order in self.browse(cr,uid,ids):
- for line in order.lines:
- if line.discount <=comp:
- res=line.discount
- if line.discount >comp:
- res2=line.discount
-
-
- statement_id= statement_obj.search(cr,uid,[('pos_statement_id','=', ids[0])])
- res3=[]
- if statement_id:
- statement=statement_obj.browse(cr,uid,statement_id[0])
- res3.append(statement.journal_id)
- list_jrnl=[]
+ comp = company_disc[0] and company_disc[0].company_id and company_disc[0].company_id.company_discount or 0.0
+ cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount <= %s", (ids[0], comp))
+ res = cr.fetchone()
+ cr.execute("SELECT discount FROM pos_order_line WHERE order_id = %s AND discount > %s", (ids[0], comp))
+ res2 = cr.fetchone()
+ cr.execute("SELECT journal_id FROM account_bank_statement_line WHERE pos_statement_id = %s ", (ids[0], ))
+ res3 = cr.fetchall()
for r in res3:
- res3=obj_journal.search(cr,uid,[('name','=',r),('special_journal','=','t')])
- is_special=res3 and res3[0] or None
+ cr.execute("SELECT id FROM account_journal WHERE name = '%s' AND special_journal = 't'", (r[0], ))
+ res3 = cr.fetchone()
+ is_special = res3 and res3[0] or None
if is_special:
list_jrnl.append(is_special)
- r = {}
for order in self.browse(cr, uid, ids):
- if order.state in ('paid','done','invoiced') and res and not res2 and not len(list_jrnl):
+ if order.state in ('paid', 'done', 'invoiced') and res and not res2 and not len(list_jrnl):
r[order.id] = 'accepted'
return r
'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
states={'draft': [('readonly', False)]}, readonly=True),
'date_order': fields.datetime('Date Ordered', readonly=True),
- 'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
- 'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
+ 'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
+ 'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
'date_validity': fields.date('Validity Date', required=True),
- 'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
- 'user_saleman': fields.many2one('res.users', 'Salesman', required=True),
+ 'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the register. It could be a reliever, a student or an interim employee."),
+ 'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
- 'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
+ 'amount_tax': fields.function(_amount_all, method=True, string='Taxes', digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
'amount_total': fields.function(_amount_total, method=True, string='Total'),
- 'amount_paid': fields.function(_total_payment, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True),
- 'amount_return': fields.function(_total_return, 'Returned', method=True),
+ 'amount_paid': fields.function(_amount_all, string='Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+ 'amount_return': fields.function(_amount_all, 'Returned', method=True, digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
'price_type': fields.selection([
- ('tax_excluded','Tax excluded')
- ], 'Price method', required=True),
- 'statement_ids': fields.one2many('account.bank.statement.line','pos_statement_id','Payments'),
- 'payments': fields.one2many('pos.payment', 'order_id', 'Order Payments', states={'draft': [('readonly', False)]}, readonly=True),
+ ('tax_excluded','Tax excluded')],
+ 'Price method', required=True),
+ 'statement_ids': fields.one2many('account.bank.statement.line', 'pos_statement_id', 'Payments', states={'draft': [('readonly', False)]}, readonly=True),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
- 'partner_id': fields.many2one( 'res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
- 'state': fields.selection([('draft', 'Draft'), ('payment', 'Payment'),
- ('advance','Advance'),
- ('paid', 'Paid'), ('done', 'Done'), ('invoiced', 'Invoiced'), ('cancel', 'Cancel')],
- 'State', readonly=True, ),
+ 'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
+ 'state': fields.selection([('draft', 'Quotation'),
+ ('payment', 'Payment'),
+ ('advance','Advance'),
+ ('paid', 'Paid'),
+ ('done', 'Done'),
+ ('invoiced', 'Invoiced'),
+ ('cancel', 'Cancel')],
+ 'State', readonly=True),
'invoice_id': fields.many2one('account.invoice', 'Invoice'),
'account_move': fields.many2one('account.move', 'Account Entry', readonly=True),
'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
- 'last_out_picking': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
+ 'picking_id': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
'first_name': fields.char('First Name', size=64),
- 'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
- ('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
'note': fields.text('Internal Notes'),
'nb_print': fields.integer('Number of Print', readonly=True),
- 'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
+ 'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True),
'invoice_wanted': fields.boolean('Create Invoice'),
- 'note_2': fields.char('Customer Note',size=64),
- 'type_rec': fields.char('Type of Receipt',size=64),
+ 'note_2': fields.char('Customer Note', size=64),
+ 'type_rec': fields.char('Type of Receipt', size=64),
'remboursed': fields.boolean('Remboursed'),
'contract_number': fields.char('Contract Number', size=512, select=1),
'journal_entry': fields.boolean('Journal Entry'),
}
- def _select_pricelist(self, cr, uid, context):
-
- """ To get default pricelist for the order"
+ def _select_pricelist(self, cr, uid, context=None):
+ """ To get default pricelist for the order"
@param name: Names of fields.
@return: pricelist ID
- """
- pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')])
- if pricelist:
- return pricelist[0]
- else:
- return False
+ """
+ pricelist = self.pool.get('product.pricelist').search(cr, uid, [('name', '=', 'Public Pricelist')], context=context)
+ return pricelist and pricelist[0] or False
- def _journal_default(self, cr, uid, context={}):
-
- """ To get default pricelist for the order"
+ def _journal_default(self, cr, uid, context=None):
+ """ To get default pricelist for the order"
@param name: Names of fields.
@return: journal ID
- """
+ """
journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
- if journal_list:
- return journal_list[0]
- else:
- return False
+ return journal_list and journal_list[0] or False
_defaults = {
+ 'user_salesman_id':lambda self, cr, uid, context: uid,
'user_id': lambda self, cr, uid, context: uid,
'sale_manager': lambda self, cr, uid, context: uid,
- 'state': lambda *a: 'draft',
- 'price_type': lambda *a: 'tax_excluded',
- 'state_2': lambda *a: 'to_verify',
+ 'state': 'draft',
+ 'price_type': 'tax_excluded',
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
- 'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
- 'date_validity': lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+6)).strftime('%Y-%m-%d'),
- 'nb_print': lambda *a: 0,
+ 'date_order': time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'date_validity': lambda *a: (datetime.today() + relativedelta(months=+6)).strftime('%Y-%m-%d'),
+ 'nb_print': 0,
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
'sale_journal': _sale_journal_get,
- 'invoice_wanted': lambda *a: False,
+ 'invoice_wanted': False,
'shop_id': _shop_get,
'pricelist_id': _select_pricelist,
}
- def test_order_lines(self, cr, uid, order, context={}):
-
- """ Test order line is created or not for the order "
+ def test_order_lines(self, cr, uid, order, context=None):
+ """ Test order line is created or not for the order "
@param name: Names of fields.
@return: True
- """
+ """
if not order.lines:
raise osv.except_osv(_('Error'), _('No order lines defined for this sale.'))
wf_service.trg_validate(uid, 'pos.order', order.id, 'paid', cr)
return True
- def dummy_button(self, cr, uid, order, context={}):
+ def dummy_button(self, cr, uid, order, context=None):
return True
def test_paid(self, cr, uid, ids, context=None):
-
- """ Test all amount is paid for this order
+ """ Test all amount is paid for this order
@return: True
- """
- for order in self.browse(cr, uid, ids, context):
+ """
+ for order in self.browse(cr, uid, ids, context=context):
if order.lines and not order.amount_total:
return True
if (not order.lines) or (not order.statement_ids) or \
- Decimal(str(order.amount_total))!=Decimal(str(order.amount_paid)):
+ Decimal(str(order.amount_total)) != Decimal(str(order.amount_paid)):
return False
return True
def _get_qty_differences(self, orders, old_picking):
-
"""check if the customer changed the product quantity """
-
order_dict = {}
for order in orders:
for line in order.lines:
return diff_dict
def _split_picking(self, cr, uid, ids, context, old_picking, diff_dict):
-
"""if the customer changes the product quantity, split the picking in two"""
-
# create a copy of the original picking and adjust the product qty:
picking_model = self.pool.get('stock.picking')
defaults = {
}
new_picking_id = picking_model.copy(cr, uid, old_picking.id, defaults) # state = 'draft'
- new_picking = picking_model.browse(cr, uid, new_picking_id, context)
+ new_picking = picking_model.browse(cr, uid, new_picking_id, context=context)
for line in new_picking.move_lines:
p_id = line.product_id.id
# delete it in the new picking:
line.unlink(context=context)
- def create_picking(self, cr, uid, ids, context={}):
-
+ def create_picking(self, cr, uid, ids, context=None):
"""Create a picking for each order and validate it."""
-
picking_obj = self.pool.get('stock.picking')
-
- orders = self.browse(cr, uid, ids, context)
+ property_obj = self.pool.get("ir.property")
+ move_obj=self.pool.get('stock.move')
+ pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
+ orders = self.browse(cr, uid, ids, context=context)
for order in orders:
- if not order.last_out_picking:
+ if not order.picking_id:
new = True
picking_id = picking_obj.create(cr, uid, {
+ 'name': pick_name,
'origin': order.name,
'type': 'out',
'state': 'draft',
'invoice_state': 'none',
'auto_picking': True,
'pos_order': order.id,
- })
- self.write(cr, uid, [order.id], {'last_out_picking': picking_id})
+ }, context=context)
+ self.write(cr, uid, [order.id], {'picking_id': picking_id}, context=context)
else:
- picking_id = order.last_out_picking.id
- picking_obj.write(cr, uid, [picking_id], {'auto_picking': True})
- picking = picking_obj.browse(cr, uid, [picking_id], context)[0]
+ picking_id = order.picking_id.id
+ picking_obj.write(cr, uid, [picking_id], {'auto_picking': True}, context=context)
+ picking = picking_obj.browse(cr, uid, [picking_id], context=context)[0]
new = False
# split the picking (if product quantity has changed):
if new:
for line in order.lines:
- if line.product_id and line.product_id.type=='service':
+ if line.product_id and line.product_id.type == 'service':
continue
- prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
- val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
- cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
- res=cr.fetchone()
- location_id=res and res[0] or None
-# location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
- stock_dest_id = int(val.split(',')[1])
+ prop_ids = property_obj.search(cr, uid, [('name', '=', 'property_stock_customer')], context=context)
+ val = property_obj.browse(cr, uid, prop_ids[0], context=context).value_reference
+ cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w WHERE w.lot_stock_id = s.id AND w.id = %s", (order.shop_id.warehouse_id.id, ))
+ res = cr.fetchone()
+ location_id = res and res[0] or None
+ stock_dest_id = val.id
if line.qty < 0:
location_id, stock_dest_id = stock_dest_id, location_id
- self.pool.get('stock.move').create(cr, uid, {
+ move_obj.create(cr, uid, {
'name': 'Stock move (POS %d)' % (order.id, ),
'product_uom': line.product_id.uom_id.id,
'product_uos': line.product_id.uom_id.id,
'state': 'waiting',
'location_id': location_id,
'location_dest_id': stock_dest_id,
- })
+ }, context=context)
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
- self.pool.get('stock.picking').force_assign(cr, uid, [picking_id], context)
+ picking_obj.force_assign(cr, uid, [picking_id], context)
return True
def set_to_draft(self, cr, uid, ids, *args):
-
- """ Changes order state to draft
+ """ Changes order state to draft
@return: True
"""
if not len(ids):
return False
-
self.write(cr, uid, ids, {'state': 'draft'})
-
wf_service = netsvc.LocalService("workflow")
for i in ids:
wf_service.trg_create(uid, 'pos.order', i, cr)
return True
def button_invalidate(self, cr, uid, ids, *args):
-
- """ Check the access for the sale order
- @return: True
- """
- res_obj = self.pool.get('res.company')
- try:
- part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
- except Exception, e:
- raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
- if part_company:
- raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
- return True
-
- def button_validate(self, cr, uid, ids, *args):
-
- """ Check the access for the sale order and update the date_validation
+ """ Check the access for the sale order
@return: True
- """
+ """
res_obj = self.pool.get('res.company')
try:
- part_company=res_obj.browse(cr,uid,uid) and res_obj.browse(cr,uid,uid).parent_id and res_obj.browse(cr,uid,uid).parent_id.id or None
- except Exception, e:
+ part_company = res_obj.browse(cr, uid, uid) and res_obj.browse(cr, uid, uid).parent_id and res_obj.browse(cr, uid, uid).parent_id.id or None
+ except Exception:
raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
if part_company:
raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
- for order in self.browse(cr, uid, ids):
- if not order.date_validation:
- cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
- val=cr.fetchone()
- val=val and val[0] or None
- if val:
- cr.execute("Update pos_order set date_validation='%s' where id = %d"%(val, order.id))
return True
-
def cancel_order(self, cr, uid, ids, context=None):
-
- """ Changes order state to cancel
+ """ Changes order state to cancel
@return: True
- """
- self.write(cr, uid, ids, {'state': 'cancel'})
- self.cancel_picking(cr, uid, ids, context={})
+ """
+ self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
+ self.cancel_picking(cr, uid, ids, context=context)
return True
def add_payment(self, cr, uid, order_id, data, context=None):
-
"""Create a new payment for the order"""
-
- res_obj = self.pool.get('res.company')
- statementl_obj = self.pool.get('account.bank.statement.line')
+ statement_obj= self.pool.get('account.bank.statement')
+ statement_line_obj = self.pool.get('account.bank.statement.line')
prod_obj = self.pool.get('product.product')
- flag=''
- curr_c=self.pool.get('res.users').browse(cr, uid, uid).company_id
- curr_company=curr_c.id
- order = self.browse(cr, uid, order_id, context)
+ property_obj = self.pool.get('ir.property')
+ curr_c = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+ curr_company = curr_c.id
+ order = self.browse(cr, uid, order_id, context=context)
if not order.num_sale and data['num_sale']:
- self.write(cr,uid,order_id,{'num_sale': data['num_sale']})
- ids_new=[]
- if order.invoice_wanted and not order.partner_id:
- raise osv.except_osv(_('Error'), _('Cannot create invoice without a partner.'))
+ self.write(cr, uid, order_id, {'num_sale': data['num_sale']}, context=context)
+ ids_new = []
args = {
'amount': data['amount'],
- }
+ }
if 'payment_date' in data.keys():
args['date'] = data['payment_date']
if 'payment_name' in data.keys():
- args['name'] = data['payment_name'] + ' ' +order.name
- account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
- args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
- if data.get('is_acc',False):
- args['is_acc']=data['is_acc']
- args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
+ args['name'] = data['payment_name'] + ' ' + order.name
+ account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+ args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
+ if data.get('is_acc', False):
+ args['is_acc'] = data['is_acc']
+ args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id
if not args['account_id']:
- raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr,uid, data['product_id']).name))
+ raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr, uid, data['product_id'], context=context).name))
args['partner_id'] = order.partner_id and order.partner_id.id or None
args['ref'] = order.contract_number or None
- statement_obj= self.pool.get('account.bank.statement')
statement_id = statement_obj.search(cr,uid, [
('journal_id', '=', data['journal']),
('company_id', '=', curr_company),
('user_id', '=', uid),
- ('state', '=', 'open')])
- if len(statement_id)==0:
+ ('state', '=', 'open')], context=context)
+ if len(statement_id) == 0:
raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
if statement_id:
- statement_id=statement_id[0]
- args['statement_id']= statement_id
- args['pos_statement_id']= order_id
- args['journal_id']= data['journal']
- statement_line_id = statementl_obj.create(cr, uid, args)
+ statement_id = statement_id[0]
+ args['statement_id'] = statement_id
+ args['pos_statement_id'] = order_id
+ args['journal_id'] = data['journal']
+ statement_line_obj.create(cr, uid, args, context=context)
ids_new.append(statement_id)
wf_service = netsvc.LocalService("workflow")
return statement_id
def add_product(self, cr, uid, order_id, product_id, qty, context=None):
-
"""Create a new order line the order"""
-
line_obj = self.pool.get('pos.order.line')
values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id'])
'product_id': product_id,
'qty': qty,
'price_unit': price,
- })
+ }, context=context)
wf_service = netsvc.LocalService("workflow")
wf_service.trg_write(uid, 'pos.order', order_id, cr)
+ return order_line_id, price
- return order_line_id
-
- def refund(self, cr, uid, ids, context={}):
-
- """Create a copy of order for refund order"""
-
+ def refund(self, cr, uid, ids, context=None):
+ """Create a copy of order for refund order"""
clone_list = []
line_obj = self.pool.get('pos.order.line')
- for order in self.browse(cr, uid, ids):
+ for order in self.browse(cr, uid, ids, context=context):
clone_id = self.copy(cr, uid, order.id, {
'name': order.name + ' REFUND',
'date_order': time.strftime('%Y-%m-%d'),
'invoice_id': False,
'nb_print': 0,
'statement_ids': False,
- })
+ }, context=context)
clone_list.append(clone_id)
- for clone in self.browse(cr, uid, clone_list):
+ for clone in self.browse(cr, uid, clone_list, context=context):
for order_line in clone.lines:
line_obj.write(cr, uid, [order_line.id], {
'qty': -order_line.qty
- })
+ }, context=context)
return clone_list
- def action_invoice(self, cr, uid, ids, context={}):
-
+ def action_invoice(self, cr, uid, ids, context=None):
"""Create a invoice of order """
-
- res_obj = self.pool.get('res.company')
inv_ref = self.pool.get('account.invoice')
inv_line_ref = self.pool.get('account.invoice.line')
- product_obj= self.pool.get('product.product')
+ product_obj = self.pool.get('product.product')
inv_ids = []
- for order in self.browse(cr, uid, ids, context):
- curr_c = order.user_saleman.company_id
+ for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context):
if order.invoice_id:
inv_ids.append(order.invoice_id.id)
continue
if not order.partner_id:
raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
- acc= order.partner_id.property_account_receivable.id
+ acc = order.partner_id.property_account_receivable.id
inv = {
'name': 'Invoice from POS: '+order.name,
'origin': order.name,
- 'account_id':acc,
- 'journal_id':order.sale_journal.id or None,
+ 'account_id': acc,
+ 'journal_id': order.sale_journal.id or None,
'type': 'out_invoice',
'reference': order.name,
'partner_id': order.partner_id.id,
inv.update(inv_ref.onchange_partner_id(cr, uid, [], 'out_invoice', order.partner_id.id)['value'])
if not inv.get('account_id', None):
inv['account_id'] = acc
- inv_id = inv_ref.create(cr, uid, inv, context)
+ inv_id = inv_ref.create(cr, uid, inv, context=context)
- self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'})
+ self.write(cr, uid, [order.id], {'invoice_id': inv_id, 'state': 'invoiced'}, context=context)
inv_ids.append(inv_id)
for line in order.lines:
inv_line = {
'quantity': line.qty,
}
inv_name = product_obj.name_get(cr, uid, [line.product_id.id], context=context)[0][1]
-
+
inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
line.product_id.id,
line.product_id.uom_id.id,
inv_line['discount'] = line.discount
inv_line['account_id'] = acc
inv_line['name'] = inv_name
-
inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\
and [(6, 0, inv_line['invoice_line_tax_id'])] or []
- inv_line_ref.create(cr, uid, inv_line, context)
+ inv_line_ref.create(cr, uid, inv_line, context=context)
for i in inv_ids:
wf_service = netsvc.LocalService("workflow")
return inv_ids
def create_account_move(self, cr, uid, ids, context=None):
-
- """Create a account move line of order """
-
+ """Create a account move line of order """
account_move_obj = self.pool.get('account.move')
account_move_line_obj = self.pool.get('account.move.line')
account_period_obj = self.pool.get('account.period')
period = account_period_obj.find(cr, uid, context=context)[0]
for order in self.browse(cr, uid, ids, context=context):
- curr_c =res_obj.browse(cr, uid, uid).company_id
+ curr_c = res_obj.browse(cr, uid, uid).company_id
comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id
- comp_id=comp_id and comp_id.id or False
+ comp_id = comp_id and comp_id.id or False
to_reconcile = []
group_tax = {}
- account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+ account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id
+
order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
# Create an entry for the sale
# Create an move for each order line
for line in order.lines:
-
tax_amount = 0
taxes = [t for t in line.product_id.taxes_id]
- if order.price_type=='tax_excluded':
- computed_taxes = account_tax_obj.compute(
- cr, uid, taxes, line.price_unit, line.qty)
+ if order.price_type == 'tax_excluded':
+ computed_taxes = account_tax_obj.compute_all(
+ cr, uid, taxes, line.price_unit, line.qty)['taxes']
else:
computed_taxes = account_tax_obj.compute_inv(
cr, uid, taxes, line.price_unit, line.qty)
group_tax[group_key] += round(tax['amount'], 2)
else:
group_tax[group_key] = round(tax['amount'], 2)
- if order.price_type!='tax_excluded':
+ if order.price_type != 'tax_excluded':
amount = line.price_subtotal - tax_amount
else:
amount = line.price_subtotal
'account defined for this product: "%s" (id:%d)') \
% (line.product_id.name, line.product_id.id, ))
-
# Empty the tax list as long as there is no tax code:
tax_code_id = False
tax_amount = 0
# Create a move for the line
account_move_line_obj.create(cr, uid, {
'name': "aa"+order.name,
- 'date': order.date_order,
+ 'date': order.date_order[:10],
'ref': order.contract_number or order.name,
'quantity': line.qty,
- 'product_id':line.product_id.id,
+ 'product_id': line.product_id.id,
'move_id': move_id,
'account_id': income_account,
'company_id': comp_id,
continue
account_move_line_obj.create(cr, uid, {
- 'name': "bb"+order.name,
- 'date': order.date_order,
+ 'name': "bb" + order.name,
+ 'date': order.date_order[:10],
'ref': order.contract_number or order.name,
'product_id':line.product_id.id,
'quantity': line.qty,
(tax_code_pos, base_code_pos, account_pos)= (0, 1, 2)
for key, amount in group_tax.items():
account_move_line_obj.create(cr, uid, {
- 'name':"cc"+order.name,
- 'date': order.date_order,
+ 'name': "cc" + order.name,
+ 'date': order.date_order[:10],
'ref': order.contract_number or order.name,
'move_id': move_id,
'company_id': comp_id,
'quantity': line.qty,
- 'product_id':line.product_id.id,
+ 'product_id': line.product_id.id,
'account_id': key[account_pos],
'credit': ((amount>0) and amount) or 0.0,
'debit': ((amount<0) and -amount) or 0.0,
# counterpart
to_reconcile.append(account_move_line_obj.create(cr, uid, {
- 'name': "dd"+order.name,
- 'date': order.date_order,
+ 'name': "dd" + order.name,
+ 'date': order.date_order[:10],
'ref': order.contract_number or order.name,
'move_id': move_id,
'company_id': comp_id,
'account_id': order_account,
- 'credit': ((order.amount_total<0) and -order.amount_total)\
+ 'credit': ((order.amount_total < 0) and -order.amount_total)\
or 0.0,
- 'debit': ((order.amount_total>0) and order.amount_total)\
+ 'debit': ((order.amount_total > 0) and order.amount_total)\
or 0.0,
'journal_id': order.sale_journal.id,
'period_id': period,
raise osv.except_osv(_('Error !'),
_('There is no receivable account defined for this journal:'\
' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
- am=0.0
for payment in order.statement_ids:
- am+=payment.amount
-
- if am > 0:
- payment_account = \
- payment.statement_id.journal_id.default_debit_account_id.id
- else:
- payment_account = \
- payment.statement_id.journal_id.default_credit_account_id.id
-
# Create one entry for the payment
if payment.is_acc:
continue
- payment_move_id = account_move_obj.create(cr, uid, {
+ account_move_obj.create(cr, uid, {
'journal_id': payment.statement_id.journal_id.id,
'period_id': period,
}, context=context)
for st in stat_l.move_ids:
for s in st.line_id:
if s.credit:
- account_move_line_obj.copy(cr, uid, s.id, { 'debit': s.credit,
- 'statement_id': False,
- 'credit': s.debit})
account_move_line_obj.copy(cr, uid, s.id, {
- 'statement_id': False,
- 'account_id':order_account
- })
-
- self.write(cr,uid,order.id,{'state':'done'})
+ 'debit': s.credit,
+ 'statement_id': False,
+ 'credit': s.debit
+ })
+ account_move_line_obj.copy(cr, uid, s.id, {
+ 'statement_id': False,
+ 'account_id': order_account
+ })
+
+ self.write(cr, uid, order.id, {'state':'done'}, context=context)
return True
def cancel_picking(self, cr, uid, ids, context=None):
+ stock_picking_obj = self.pool.get('stock.picking')
for order in self.browse(cr, uid, ids, context=context):
for picking in order.pickings:
- self.pool.get('stock.picking').unlink(cr, uid, [picking.id], context)
+ stock_picking_obj.unlink(cr, uid, [picking.id], context=context)
return True
def action_payment(self, cr, uid, ids, context=None):
vals = {'state': 'payment'}
- sequence_obj=self.pool.get('ir.sequence')
- for pos in self.browse(cr, uid, ids):
+ sequence_obj = self.pool.get('ir.sequence')
+ for pos in self.browse(cr, uid, ids, context=context):
create_contract_nb = False
for line in pos.lines:
if line.product_id.product_type == 'MD':
create_contract_nb = True
break
if create_contract_nb:
- seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_saleman.login)
- vals['contract_number'] ='%s-%s' % (pos.user_saleman.login, seq)
- self.write(cr, uid, ids, vals)
+ seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
+ vals['contract_number'] = '%s-%s' % (pos.user_salesman_id.login, seq)
+ self.write(cr, uid, ids, vals, context=context)
def action_paid(self, cr, uid, ids, context=None):
if not context:
context = {}
- if context.get('flag',False):
- self.create_picking(cr, uid, ids, context={})
- self.write(cr, uid, ids, {'state': 'paid'})
+ if context.get('flag', False):
+ self.create_picking(cr, uid, ids, context=None)
+ self.write(cr, uid, ids, {'state': 'paid'}, context=context)
else:
- context['flag']=True
+ context['flag'] = True
return True
def action_cancel(self, cr, uid, ids, context=None):
- self.write(cr, uid, ids, {'state': 'cancel'})
+ self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
return True
def action_done(self, cr, uid, ids, context=None):
for order in self.browse(cr, uid, ids, context=context):
if not order.journal_entry:
- self.create_account_move(cr, uid, ids, context={})
+ self.create_account_move(cr, uid, ids, context=None)
return True
def compute_state(self, cr, uid, id):
- cr.execute("select act.id, act.name from wkf_activity act "
- "inner join wkf_workitem item on act.id=item.act_id "
- "inner join wkf_instance inst on item.inst_id=inst.id "
- "inner join wkf on inst.wkf_id=wkf.id "
- "where wkf.osv='pos.order' and inst.res_id=%s "
- "order by act.name", (id,))
+ cr.execute("SELECT act.id, act.name FROM wkf_activity act "
+ "INNER JOIN wkf_workitem item ON act.id = item.act_id "
+ "INNER JOIN wkf_instance inst ON item.inst_id = inst.id "
+ "INNER JOIN wkf ON inst.wkf_id = wkf.id "
+ "WHERE wkf.osv = 'pos.order' AND inst.res_id = %s "
+ "ORDER BY act.name", (id, ))
return [name for id, name in cr.fetchall()]
pos_order()
class account_bank_statement(osv.osv):
_inherit = 'account.bank.statement'
- _columns={
- 'user_id': fields.many2one('res.users',ondelete='cascade',string='User', readonly=True),
+ _columns= {
+ 'user_id': fields.many2one('res.users', ondelete='cascade', string='User', readonly=True),
}
_defaults = {
'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id
for line in self.browse(cr, uid, ids):
res[line.id] = line.statement_id and line.statement_id.journal_id and line.statement_id.journal_id.name or None
return res
- _columns={
+ _columns= {
'journal_id': fields.function(_get_statement_journal, method=True,store=True, string='Journal', type='char', size=64),
- 'am_out':fields.boolean("To count"),
- 'is_acc':fields.boolean("Is accompte"),
- 'pos_statement_id': fields.many2one('pos.order',ondelete='cascade'),
+ 'am_out': fields.boolean("To count"),
+ 'is_acc': fields.boolean("Is accompte"),
+ 'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
}
account_bank_statement_line()
_name = "pos.order.line"
_description = "Lines of Point of Sale"
- def _get_amount(self, cr, uid, ids, field_name, arg, context):
+ def _get_amount(self, cr, uid, ids, field_name, arg, context=None):
res = {}
- for line in self.browse(cr, uid, ids):
+ for line in self.browse(cr, uid, ids, context=context):
price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
- res[line.id]=price
+ res[line.id] = price
return res
- def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context):
- res = {}
+ def _amount_line_ttc(self, cr, uid, ids, field_name, arg, context=None):
+ res = dict.fromkeys(ids, 0.0)
account_tax_obj = self.pool.get('account.tax')
- for line in self.browse(cr, uid, ids):
+ self.price_by_product_multi(cr, uid, ids)
+ for line in self.browse(cr, uid, ids, context=context):
tax_amount = 0.0
taxes = [t for t in line.product_id.taxes_id]
- computed_taxes = account_tax_obj.compute(cr, uid, taxes, line.price_unit, line.qty)
+ if line.qty == 0.0:
+ continue
+ computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
for tax in computed_taxes:
tax_amount += tax['amount']
- price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
- if line.discount!=0.0:
+ if line.discount != 0.0:
res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
else:
- res[line.id]=line.price_unit*line.qty
+ res[line.id] = line.price_unit*line.qty
res[line.id] = res[line.id] + tax_amount
-
return res
- def _amount_line(self, cr, uid, ids, field_name, arg, context):
- res = {}
- for line in self.browse(cr, uid, ids):
- price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
+ def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
+ res = {}
+ self.price_by_product_multi(cr, uid, ids)
+ for line in self.browse(cr, uid, ids, context=context):
if line.discount!=0.0:
res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
else:
- res[line.id]=line.price_unit*line.qty
+ res[line.id] = line.price_unit * line.qty
+ return res
+
+ def _amount_line_all(self, cr, uid, ids, field_names, arg, context):
+ res = dict([(i, {}) for i in ids])
+ account_tax_obj = self.pool.get('account.tax')
+
+ self.price_by_product_multi(cr, uid, ids)
+ for line in self.browse(cr, uid, ids):
+ for f in field_names:
+ if f == 'price_subtotal':
+ if line.discount != 0.0:
+ res[line.id][f] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+ else:
+ res[line.id][f] = line.price_unit * line.qty
+ elif f == 'price_subtotal_incl':
+ tax_amount = 0.0
+ taxes = [t for t in line.product_id.taxes_id]
+ if line.qty == 0.0:
+ res[line.id][f] = 0.0
+ continue
+ computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit, line.qty)['taxes']
+ for tax in computed_taxes:
+ tax_amount += tax['amount']
+ if line.discount!=0.0:
+ res[line.id][f] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
+ else:
+ res[line.id][f] = line.price_unit * line.qty
+ res[line.id][f] += tax_amount
+ return res
+
+ def price_by_product_multi(self, cr, uid, ids, context=None):
+ if context is None:
+ context = {}
+ res = {}.fromkeys(ids, 0.0)
+ lines = self.browse(cr, uid, ids, context=context)
+
+ pricelist_ids = [line.order_id.pricelist_id.id for line in lines]
+ products_by_qty_by_partner = [(line.product_id.id, line.qty, line.order_id.partner_id.id) for line in lines]
+
+ price_get_multi_res = self.pool.get('product.pricelist').price_get_multi(cr, uid, pricelist_ids, products_by_qty_by_partner, context=context)
+
+ for line in lines:
+ pricelist = line.order_id.pricelist_id.id
+ product_id = line.product_id
+
+ if not product_id:
+ res[line.id] = 0.0
+ continue
+ if not pricelist:
+ raise osv.except_osv(_('No Pricelist !'),
+ _('You have to select a pricelist in the sale form !\n' \
+ 'Please set one before choosing a product.'))
+
+ #old_price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], product_id.id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
+ #print "prod_id: %s, pricelist: %s, price: %s" % (product_id.id, pricelist, price)
+ price = price_get_multi_res[line.product_id.id][pricelist]
+ #print "prod_id: %s, pricelist: %s, price2: %s" % (product_id.id, pricelist, price2)
+
+ #if old_price != price:
+ # raise Exception('old_price != price')
+
+ unit_price = price or product_id.list_price
+ res[line.id] = unit_price
+ if unit_price is False:
+ raise osv.except_osv(_('No valid pricelist line found !'),
+ _("Couldn't find a pricelist line matching this product" \
+ " and quantity.\nYou have to change either the product," \
+ " the quantity or the pricelist."))
return res
def price_by_product(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
raise osv.except_osv(_('No Pricelist !'),
_('You have to select a pricelist in the sale form !\n' \
'Please set one before choosing a product.'))
- p_obj = self.pool.get('product.product').browse(cr,uid,product_id).list_price
+ p_obj = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
+ uom_id = p_obj.uom_po_id.id
price = self.pool.get('product.pricelist').price_get(cr, uid,
- [pricelist], product_id, qty or 1.0, partner_id)[pricelist]
- if price is False:
+ [pricelist], product_id, qty or 1.0, partner_id, {'uom': uom_id})[pricelist]
+ unit_price=price or p_obj.list_price
+ if unit_price is False:
raise osv.except_osv(_('No valid pricelist line found !'),
_("Couldn't find a pricelist line matching this product" \
" and quantity.\nYou have to change either the product," \
" the quantity or the pricelist."))
- return price
+ return unit_price
def onchange_product_id(self, cr, uid, ids, pricelist, product_id, qty=0, partner_id=False):
price = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
- self.write(cr,uid,ids,{'price_unit':price})
- return {'value': {'price_unit': price}, 'qty': 1}
+ self.write(cr, uid, ids, {'price_unit':price})
+ pos_stot = (price * qty)
+ return {'value': {'price_unit': price, 'price_subtotal_incl': pos_stot}}
- def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist,qty,partner_id, product_id,*a):
+ def onchange_subtotal(self, cr, uid, ids, discount, price, pricelist, qty,partner_id, product_id, *a):
prod_obj = self.pool.get('product.product')
price_f = self.price_by_product(cr, uid, ids, pricelist, product_id, qty, partner_id)
- prod_id=''
+ prod_id = ''
if product_id:
- prod_id=prod_obj.browse(cr,uid,product_id).disc_controle
- disc=0.0
- if (disc != 0.0 or prod_id) and price_f>0:
- disc=100-(price/price_f*100)
- return {'value':{'discount':disc, 'price_unit':price_f}}
+ prod_id = prod_obj.browse(cr, uid, product_id).disc_controle
+ disc = 0.0
+ if (disc != 0.0 or prod_id) and price_f > 0:
+ disc = 100 - (price/price_f*100)
+ return {'value': {'discount': disc, 'price_unit': price_f}}
return {}
- def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
- pos_order = self.pool.get('pos.order.line')
+ def onchange_dis(self, cr, uid, ids, qty, price_subtotal_incl, discount, *a):
+ price_sub = price_subtotal_incl
+ sub_total_discount = price_sub - (price_subtotal_incl*(discount*0.01))
+ return {'value': {'price_subtotal_incl': sub_total_discount}}
+
+ def onchange_ded(self, cr, uid, ids, val_ded, price_u, *a):
res_obj = self.pool.get('res.users')
- res_company = self.pool.get('res.company')
- comp = res_obj.browse(cr,uid,uid).company_id.company_discount or 0.0
- val=0.0
+ comp = res_obj.browse(cr, uid, uid).company_id.company_discount or 0.0
+ val = 0.0
if val_ded and price_u:
- val=100.0*val_ded/price_u
+ val=100.0 * val_ded / price_u
if val > comp:
- return {'value': {'discount':val, 'notice':'' }}
- return {'value': {'discount':val}}
+ return {'value': {'discount': val, 'notice': '' }}
+ return {'value': {'discount': val}}
- def onchange_discount(self, cr, uid,ids, discount,price,*a):
+ def onchange_discount(self, cr, uid, ids, discount, price, *a):
pos_order = self.pool.get('pos.order.line')
res_obj = self.pool.get('res.users')
- res_company = self.pool.get('res.company')
company_disc = pos_order.browse(cr,uid,ids)
if discount:
if not company_disc:
comp= company_disc[0] and company_disc[0].order_id.company_id and company_disc[0].order_id.company_id.company_discount or 0.0
if discount > comp :
- return {'value': {'notice':'','price_ded':price*discount*0.01 or 0.0 }}
+ return {'value': {'notice': '', 'price_ded': price * discount * 0.01 or 0.0 }}
else:
- return {'value': {'notice':'Minimum Discount','price_ded':price*discount*0.01 or 0.0 }}
+ return {'value': {'notice': 'Minimum Discount', 'price_ded': price * discount * 0.01 or 0.0 }}
else :
- return {'value': {'notice':'No Discount', 'price_ded':price*discount*0.01 or 0.0 }}
+ return {'value': {'notice': 'No Discount', 'price_ded': price * discount * 0.01 or 0.0}}
+
+ def onchange_qty(self, cr, uid, ids, discount, qty, price, context=None):
+ subtotal = qty * price
+ if discount:
+ subtotal = subtotal - (subtotal * discount / 100)
+ return {'value': {'price_subtotal_incl': subtotal}}
+
_columns = {
'name': fields.char('Line Description', size=512),
- 'company_id':fields.many2one('res.company', 'Company', required=True),
+ 'company_id': fields.many2one('res.company', 'Company', required=True),
'notice': fields.char('Discount Notice', size=128, required=True),
'serial_number': fields.char('Serial Number', size=128),
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
- 'price_ded': fields.float('Discount(Amount)'),
+ 'price_ded': fields.float('Discount(Amount)', digits_compute=dp.get_precision('Point Of Sale')),
'qty': fields.float('Quantity'),
'qty_rfd': fields.float('Refunded Quantity'),
- 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o Tax'),
- 'price_subtotal_incl': fields.function(_amount_line_ttc, method=True, string='Subtotal'),
+ 'price_subtotal': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal w/o Tax'),
+ 'price_subtotal_incl': fields.function(_amount_line_all, method=True, multi='pos_order_line_amount', string='Subtotal'),
'discount': fields.float('Discount (%)', digits=(16, 2)),
'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
'create_date': fields.datetime('Creation Date', readonly=True),
- }
+ }
_defaults = {
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order.line'),
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
}
- def create(self, cr, user, vals, context={}):
+ def create(self, cr, user, vals, context=None):
if vals.get('product_id'):
- return super(pos_order_line, self).create(cr, user, vals, context)
+ return super(pos_order_line, self).create(cr, user, vals, context=context)
return False
- def write(self, cr, user, ids, values, context={}):
+ def write(self, cr, user, ids, values, context=None):
if 'product_id' in values and not values['product_id']:
return False
- return super(pos_order_line, self).write(cr, user, ids, values, context)
+ return super(pos_order_line, self).write(cr, user, ids, values, context=context)
def _scan_product(self, cr, uid, ean, qty, order):
# search pricelist_id
+ product_obj = self.pool.get('product.product')
pricelist_id = self.pool.get('pos.order').read(cr, uid, [order], ['pricelist_id'] )
if not pricelist_id:
return False
new_line = True
- product_id = self.pool.get('product.product').search(cr, uid, [('ean13','=', ean)])
+ product_id = product_obj.search(cr, uid, [('ean13','=', ean)])
if not product_id:
return False
# search price product
- product = self.pool.get('product.product').read(cr, uid, product_id)
+ product = product_obj.read(cr, uid, product_id)
product_name = product[0]['name']
price = self.price_by_product(cr, uid, 0, pricelist_id[0]['pricelist_id'][0], product_id[0], 1)
- order_line_ids = self.search(cr, uid, [('name','=',product_name),('order_id','=',order)])
+ order_line_ids = self.search(cr, uid, [('name', '=', product_name), ('order_id', '=' ,order)])
if order_line_ids:
new_line = False
order_line_id = order_line_ids[0]
'qty': qty,
'name': product_name,
'order_id': order,
- }
+ }
line_id = self.create(cr, uid, vals)
if not line_id:
raise osv.except_osv(_('Error'), _('Create line failed !'))
}
line_id = self.write(cr, uid, order_line_id, vals)
if not line_id:
- raise wizard.except_wizard(_('Error'), _('Modify line failed !'))
+ raise osv.except_osv(_('Error'), _('Modify line failed !'))
line_id = order_line_id
- price_line = float(qty)*float(price)
- return {'name': product_name, 'product_id': product_id[0], 'price': price, 'price_line': price_line ,'qty': qty }
+ price_line = float(qty) * float(price)
+ return {
+ 'name': product_name,
+ 'product_id': product_id[0],
+ 'price': price,
+ 'price_line': price_line ,
+ 'qty': qty
+ }
pos_order_line()
-
-class pos_payment(osv.osv):
- _name = 'pos.payment'
- _description = 'Pos Payment'
-
- def _journal_get(self, cr, uid, context={}):
- obj = self.pool.get('account.journal')
- ids = obj.search(cr, uid, [('type', '=', 'cash')])
- res = obj.read(cr, uid, ids, ['id', 'name'], context)
- res = [(r['id'], r['name']) for r in res]
- return res
-
- def _journal_default(self, cr, uid, context={}):
- journal_list = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash')])
- if journal_list:
- return journal_list[0]
- else:
- return False
-
- _columns = {
- 'name': fields.char('Description', size=64),
- 'order_id': fields.many2one('pos.order', 'Order Ref', required=True, ondelete='cascade'),
- 'journal_id': fields.many2one('account.journal', "Journal", required=True),
- 'payment_id': fields.many2one('account.payment.term','Payment Term', select=True),
- 'payment_nb': fields.char('Piece Number', size=32),
- 'payment_name': fields.char('Payment Name', size=32),
- 'payment_date': fields.date('Payment Date', required=True),
- 'amount': fields.float('Amount', required=True),
- }
- _defaults = {
- 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.payment'),
- 'journal_id': _journal_default,
- 'payment_date': lambda *a: time.strftime('%Y-%m-%d'),
- }
-
- def create(self, cr, user, vals, context={}):
- if vals.get('journal_id') and vals.get('amount'):
- return super(pos_payment, self).create(cr, user, vals, context)
- return False
-
- def write(self, cr, user, ids, values, context={}):
- if 'amount' in values and not values['amount']:
- return False
- if 'journal_id' in values and not values['journal_id']:
- return False
- return super(pos_payment, self).write(cr, user, ids, values, context)
-
-pos_payment()
-
-class account_move_line(osv.osv):
-
- _inherit = 'account.move.line'
- def create(self, cr, user, vals, context={}):
- pos_obj = self.pool.get('pos.order')
- val_name = vals.get('name', '')
- val_ref = vals.get('ref', '')
- if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
- aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
- name_pos = aaa.groups()[0]
- pos_id = name_pos.replace('POS ','')
- if pos_id and pos_id.isdigit():
- pos_curr = pos_obj.browse(cr,user,int(pos_id))
- pos_curr = pos_curr and pos_curr.contract_number or ''
- vals['ref'] = pos_curr or vals.get('ref')
- return super(account_move_line, self).create(cr, user, vals, context)
-
-account_move_line()
-
-
-class account_move(osv.osv):
-
- _inherit = 'account.move'
-
- def create(self, cr, user, vals, context={}):
- pos_obj = self.pool.get('pos.order')
- val_name = vals.get('name', '')
- val_ref = vals.get('ref', '')
- if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
- aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
- name_pos = aaa.groups()[0]
- pos_id = name_pos.replace('POS ','')
- if pos_id and pos_id.isdigit():
- pos_curr = pos_obj.browse(cr,user,int(pos_id))
- pos_curr = pos_curr and pos_curr.contract_number or ''
- vals['ref'] = pos_curr or vals.get('ref')
- return super(account_move, self).create(cr, user, vals, context)
-
-account_move()
-
-
class product_product(osv.osv):
_inherit = 'product.product'
_columns = {
- 'income_pdt': fields.boolean('Product for Incoming'),
+ 'income_pdt': fields.boolean('Product for Input'),
'expense_pdt': fields.boolean('Product for expenses'),
- 'am_out': fields.boolean('Controle for Outgoing Operations'),
- 'disc_controle': fields.boolean('Discount Controle '),
-}
+ 'am_out': fields.boolean('Control for Output Operations'),
+ 'disc_controle': fields.boolean('Discount Control'),
+ }
_defaults = {
- 'disc_controle': lambda *a: True,
-}
+ 'disc_controle': True,
+ }
product_product()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+class stock_picking(osv.osv):
+ _inherit = 'stock.picking'
+ _columns = {
+ 'pos_order': fields.many2one('pos.order', 'Pos order'),
+ }
+stock_picking()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff