[IMP,REF] point_of_sale: Removed empty xml files. Improved files suggested by buildbot. Button name changed for Return picking wizard.
bzr revid: uco@tinyerp.com-20101001101526-v862mp6wa1nkp105
This commit is contained in:
parent
23911700a8
commit
dc76e7ecb6
|
@ -67,12 +67,11 @@ Main features :
|
|||
'report/report_pos_order_view.xml',
|
||||
'report/report_cash_register_view.xml',
|
||||
'pos_sequence.xml',
|
||||
'pos_data.xml',
|
||||
'pos_workflow.xml',
|
||||
'statement_view.xml',
|
||||
'statement_report.xml',
|
||||
],
|
||||
'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml',],
|
||||
'demo_xml': ['pos_demo.xml','singer_statement_demo.xml'],
|
||||
'test':['test/pos_test.yml',
|
||||
'test/pos_report.yml',
|
||||
],
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="0">
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data>
|
||||
</data>
|
||||
</openerp>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
</data>
|
||||
</openerp>
|
|
@ -1,3 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<openerp>
|
||||
</openerp>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
</data>
|
||||
</openerp>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -109,7 +109,6 @@ class pos_details(report_sxw.rml_parse):
|
|||
|
||||
def _get_payments(self, form,user, ignore_gift=False):
|
||||
statement_line_obj = self.pool.get("account.bank.statement.line")
|
||||
gift_journal_id = None
|
||||
if ignore_gift:
|
||||
config_journal_ids = self.pool.get("pos.config.journal").search(self.cr, self.uid, [('code', '=', 'GIFT')])
|
||||
if len(config_journal_ids):
|
||||
|
@ -162,7 +161,6 @@ class pos_details(report_sxw.rml_parse):
|
|||
res = {}
|
||||
temp={}
|
||||
list_ids = []
|
||||
c=[]
|
||||
temp2 = 0.0
|
||||
pos_ids=self.pool.get("pos.order").search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('state','in',['paid','invoiced','done']),('user_id','=',self.uid)])
|
||||
temp.update({'name':''})
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
</data>
|
||||
</openerp>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" ?>
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
</data>
|
||||
</openerp>
|
|
@ -129,7 +129,7 @@ class pos_box_entries(osv.osv_memory):
|
|||
if address_u:
|
||||
partner_id = address_u.partner_id and address_u.partner_id.id or None
|
||||
args['partner_id'] = partner_id
|
||||
statement_line_id = bank_statement.create(cr, uid, args)
|
||||
bank_statement.create(cr, uid, args)
|
||||
|
||||
return {}
|
||||
|
||||
|
|
|
@ -35,8 +35,6 @@ class pos_close_statement(osv.osv_memory):
|
|||
@param context: A standard dictionary
|
||||
@return : Blank Dictionary
|
||||
"""
|
||||
company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
|
||||
list_statement = []
|
||||
mod_obj = self.pool.get('ir.model.data')
|
||||
statement_obj = self.pool.get('account.bank.statement')
|
||||
journal_obj = self.pool.get('account.journal')
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
from osv import osv
|
||||
from tools.translate import _
|
||||
import time
|
||||
|
||||
class pos_open_statement(osv.osv_memory):
|
||||
_name = 'pos.open.statement'
|
||||
|
|
|
@ -79,7 +79,7 @@ class pos_make_payment(osv.osv_memory):
|
|||
return res
|
||||
|
||||
def view_init(self, cr, uid, fields_list, context=None):
|
||||
res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
|
||||
super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
|
||||
active_id = context and context.get('active_id', False) or False
|
||||
if active_id:
|
||||
order = self.pool.get('pos.order').browse(cr, uid, active_id)
|
||||
|
|
|
@ -123,9 +123,9 @@ class pos_return(osv.osv_memory):
|
|||
<button icon='gtk-cancel' special="cancel"
|
||||
string="Cancel" />
|
||||
<button icon='gtk-ok' name= "create_returns"
|
||||
string="Return goods and Exchange" type="object"/>
|
||||
string="Return with Echange" type="object"/>
|
||||
<button icon='gtk-ok' name="create_returns2"
|
||||
string="Return without Refund" type="object"/>
|
||||
string="Refund Without Exchange" type="object"/>
|
||||
</form>"""
|
||||
|
||||
result['arch'] = _moves_arch_lst
|
||||
|
|
Loading…
Reference in New Issue