summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addons/point_of_sale/__openerp__.py3
-rw-r--r--addons/point_of_sale/multi_company_demo.xml7
-rw-r--r--addons/point_of_sale/multi_company_stock_data.xml5
-rw-r--r--addons/point_of_sale/pos_data.xml6
-rw-r--r--addons/point_of_sale/pos_wizard.xml3
-rw-r--r--addons/point_of_sale/posr_data.xml6
-rw-r--r--addons/point_of_sale/posrule_data.xml6
-rw-r--r--addons/point_of_sale/report/pos_details.py2
-rw-r--r--addons/point_of_sale/statement_data.xml5
-rw-r--r--addons/point_of_sale/statement_rules.xml6
-rw-r--r--addons/point_of_sale/wizard/pos_box_entries.py2
-rw-r--r--addons/point_of_sale/wizard/pos_close_statement.py2
-rw-r--r--addons/point_of_sale/wizard/pos_open_statement.py1
-rw-r--r--addons/point_of_sale/wizard/pos_payment.py2
-rw-r--r--addons/point_of_sale/wizard/pos_return.py4
15 files changed, 5 insertions, 55 deletions
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index ad466b12522..1c23a27acd1 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -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',
],
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
deleted file mode 100644
index 9ae66800ff9..00000000000
--- a/addons/point_of_sale/multi_company_demo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
- <data noupdate="0">
-
- </data>
-</openerp>
-
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
deleted file mode 100644
index cc8d30d080d..00000000000
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
- <data>
- </data>
-</openerp>
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
deleted file mode 100644
index 14710cf8f37..00000000000
--- a/addons/point_of_sale/pos_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
- <data>
-
- </data>
-</openerp>
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
deleted file mode 100644
index 4a321d7787f..00000000000
--- a/addons/point_of_sale/pos_wizard.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-</openerp>
diff --git a/addons/point_of_sale/posr_data.xml b/addons/point_of_sale/posr_data.xml
deleted file mode 100644
index 3ba8df59b13..00000000000
--- a/addons/point_of_sale/posr_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
- <data>
-
- </data>
-</openerp>
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
deleted file mode 100644
index 7f165742f03..00000000000
--- a/addons/point_of_sale/posrule_data.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
- <data>
- </data>
-</openerp>
-
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index 16181e15a2a..7f427c845da 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -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':''})
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
deleted file mode 100644
index 2780cd0f8d0..00000000000
--- a/addons/point_of_sale/statement_data.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
- <data>
- </data>
-</openerp>
diff --git a/addons/point_of_sale/statement_rules.xml b/addons/point_of_sale/statement_rules.xml
deleted file mode 100644
index 3ba8df59b13..00000000000
--- a/addons/point_of_sale/statement_rules.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
- <data>
-
- </data>
-</openerp>
diff --git a/addons/point_of_sale/wizard/pos_box_entries.py b/addons/point_of_sale/wizard/pos_box_entries.py
index 9428d0ec1ae..103e49be62d 100644
--- a/addons/point_of_sale/wizard/pos_box_entries.py
+++ b/addons/point_of_sale/wizard/pos_box_entries.py
@@ -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 {}
diff --git a/addons/point_of_sale/wizard/pos_close_statement.py b/addons/point_of_sale/wizard/pos_close_statement.py
index a3650a6f76a..82e47a2caa3 100644
--- a/addons/point_of_sale/wizard/pos_close_statement.py
+++ b/addons/point_of_sale/wizard/pos_close_statement.py
@@ -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')
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 985324851f6..7e178e6a161 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -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'
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 961ba7949a4..e23fbedd141 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -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)
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index 24ddf59a15a..206b77b7080 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-23 19:18:34 +0000