odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] point_of_sale: from stw: also draft of client integration 

bzr revid: fva@openerp.com-20120604162722-e8vf0w3z1xpeafcc
This commit is contained in:
Frédéric van der Essen 2012-06-04 18:27:22 +02:00
parent ac91821836 fea9d6eae3
commit 5702fe9301
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr/hr.py
View File

@ -249,13 +249,13 @@ class hr_employee(osv.osv):
work_email = self.pool.get('res.users').browse(cr, uid, user_id, context=context).user_email
return {'value': {'work_email' : work_email}}
def _get_photo(self, cr, uid, context=None):
def _default_get_photo(self, cr, uid, context=None):
photo_path = addons.get_module_resource('hr','images','photo.png')
return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64'), context=context)
_defaults = {
'active': 1,
'photo': _get_photo,
'photo': _default_get_photo,
'marital': 'single',
'color': 0,
}

2
addons/point_of_sale/account_bank_statement.py
View File

@ -31,10 +31,12 @@ class account_journal(osv.osv):
'closing_control': fields.boolean('Closing Control', help="If you want the journal should be control at closing, check this option"),
'amount_authorized_diff' : fields.float('Amount Authorized Difference'),
'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'),
}
_defaults = {
'opening_control' : True,
'closing_control' : True,
'self_checkout_payment_method' : False,
}
account_journal()

1
addons/point_of_sale/account_statement_view.xml
View File

@ -14,6 +14,7 @@
<field name="opening_control"/>
<field name="closing_control"/>
<field name="amount_authorized_diff"/>
<field name="self_checkout_payment_method" />
</group>
</page>
</xpath>

26
addons/point_of_sale/point_of_sale.py
View File

@ -425,31 +425,30 @@ class pos_order(osv.osv):
_order = "id desc"
def create_from_ui(self, cr, uid, orders, context=None):
#pdb.set_trace()
#_logger.info("orders: %r", orders)
order_ids = []
for tmp_order in orders:
order = tmp_order['data']
# order :: {'name': 'Order 1329148448062', 'amount_paid': 9.42, 'lines': [[0, 0, {'discount': 0, 'price_unit': 1.46, 'product_id': 124, 'qty': 5}], [0, 0, {'discount': 0, 'price_unit': 0.53, 'product_id': 62, 'qty': 4}]], 'statement_ids': [[0, 0, {'journal_id': 7, 'amount': 9.42, 'name': '2012-02-13 15:54:12', 'account_id': 12, 'statement_id': 21}]], 'amount_tax': 0, 'amount_return': 0, 'amount_total': 9.42}
order_obj = self.pool.get('pos.order')
# get statements out of order because they will be generated with add_payment to ensure
# the module behavior is the same when using the front-end or the back-end
if not order['statement_ids']:
continue
statement_ids = order.pop('statement_ids')
statement_ids = order.get('statement_ids', [])
order_id = self.create(cr, uid, order, context)
order_ids.append(order_id)
# call add_payment; refer to wizard/pos_payment for data structure
# add_payment launches the 'paid' signal to advance the workflow to the 'paid' state
data = {
'journal': statement_ids[0][2]['journal_id'],
'amount': order['amount_paid'],
'payment_name': order['name'],
'payment_date': statement_ids[0][2]['name'],
}
order_obj.add_payment(cr, uid, order_id, data, context=context)
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
wf_service.trg_write(uid, 'pos.order', order_id, cr)
#self.add_payment(cr, uid, order_id, data, context=context)
return order_ids
def unlink(self, cr, uid, ids, context=None):
@ -652,11 +651,10 @@ class pos_order(osv.osv):
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)
ids_new = []
args = {
'amount': data['amount'],
}
if 'payment_date' in data.keys():
if 'payment_date' in data:
args['date'] = data['payment_date']
args['name'] = order.name
if data.get('payment_name', False):
@ -698,7 +696,6 @@ class pos_order(osv.osv):
})
statement_line_obj.create(cr, uid, args, context=context)
ids_new.append(statement_id)
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
@ -876,10 +873,7 @@ class pos_order(osv.osv):
def insert_data(data_type, values):
# if have_to_group_by:
if have_to_group_by:
sale_journal_id = session.config_id.journal_id.id
else:
sale_journal_id = order.sale_journal.id
sale_journal_id = order.sale_journal.id
# 'quantity': line.qty,
# 'product_id': line.product_id.id,
@ -897,7 +891,7 @@ class pos_order(osv.osv):
elif data_type == 'tax':
key = ('tax', values['tax_code_id'],)
elif data_type == 'counter_part':
key = ('counter_part',)
key = ('counter_part', values['partner_id'], values['account_id'])
else:
return

4
addons/point_of_sale/point_of_sale_view.xml
View File

@ -756,12 +756,12 @@
<button string="Set to Inactive" name="set_inactive" type="object" states="active" />
<button string="Set to Deprecated" name="set_deprecate" type="object" states="active,inactive" />
<div class="oe_right">
<field name="state" widget="statusbar" statusbar_visible="active,inactive,deprecated" statusbar_colors='{"deprecated" : "red"}' nolabel="1"/>
<field name="state" widget="statusbar" statusbar_visible="active,inactive,deprecated" statusbar_colors='{"deprecated" : "red"}' nolabel="1"/>
</div>
</div>
<sheet layout="auto">
<field name="name" placeholder="POS/0001"/>
<field name="name"/>
<field name="shop_id" widget="selection" />
<field name="journal_id" widget="selection" />
<field name="sequence_id" readonly="1"/>