['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
- Sale Shop multi-company
- ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
-
From 5af2e2ff78dab87eb2fca2b821e341e1340964ad Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 21 Jan 2013 15:41:04 +0530
Subject: [PATCH 02/72] [IMP]remove sale.shop from sale_analytic_plans
bzr revid: sgo@tinyerp.com-20130121101104-g5xzeitx6exjdrmk
---
addons/sale_analytic_plans/sale_analytic_plans.py | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 2abbab7ab38..5ccae840a73 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -39,14 +39,4 @@ class sale_order_line(osv.osv):
sale_order_line()
-class sale_order(osv.osv):
- _inherit = "sale.order"
-
- def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
- # Remove the project_id from the result of super() call, if any, as this field is not in the view anymore
- res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shop_id, context=context)
- if res.get('value',{}).get('project_id'):
- del(res['value']['project_id'])
- return res
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
From 923115f895cb9f5f555ecc990e746765beb2872f Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Mon, 21 Jan 2013 15:41:27 +0530
Subject: [PATCH 03/72] [IMP]remove total sale.shop from sale_crm
bzr revid: sgo@tinyerp.com-20130121101127-4a1anxi5jkdeivtz
---
addons/sale_crm/wizard/crm_make_sale.py | 8 --------
addons/sale_crm/wizard/crm_make_sale_view.xml | 1 -
2 files changed, 9 deletions(-)
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index a052f47ca1f..7abdaa9e04d 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -93,8 +93,6 @@ class crm_make_sale(osv.osv_memory):
'origin': _('Opportunity: %s') % str(case.id),
'section_id': case.section_id and case.section_id.id or False,
'categ_ids': [(6, 0, [categ_id.id for categ_id in case.categ_ids])],
- 'shop_id': make.shop_id.id,
- 'partner_id': partner.id,
'pricelist_id': pricelist,
'partner_invoice_id': partner_addr['invoice'],
'partner_shipping_id': partner_addr['delivery'],
@@ -137,18 +135,12 @@ class crm_make_sale(osv.osv_memory):
}
return value
- def _get_shop_id(self, cr, uid, ids, context=None):
- cmpny_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
- shop = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', cmpny_id)])
- return shop and shop[0] or False
_columns = {
- 'shop_id': fields.many2one('sale.shop', 'Shop', required=True),
'partner_id': fields.many2one('res.partner', 'Customer', required=True, domain=[('customer','=',True)]),
'close': fields.boolean('Mark Won', help='Check this to close the opportunity after having created the sales order.'),
}
_defaults = {
- 'shop_id': _get_shop_id,
'close': False,
'partner_id': _selectPartner,
}
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index 2207cf536e2..695f3e919eb 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -10,7 +10,6 @@
-
- Chicago Shop
-
-
- Birmingham shop
-
From 5600ce8a3416af5852be7b8e743f073c34bbc73a Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Tue, 22 Jan 2013 16:38:57 +0530
Subject: [PATCH 05/72] [IMP]remove date related sale.shop and add warehouse_id
as new field to handle location in sale order
bzr revid: sgo@tinyerp.com-20130122110857-61jsli1sywu3h5q0
---
addons/sale/sale.py | 7 +++++
addons/sale_stock/__openerp__.py | 1 -
addons/sale_stock/report/sale_report.py | 2 --
addons/sale_stock/res_config.py | 3 ---
addons/sale_stock/res_config_view.xml | 6 -----
addons/sale_stock/sale_stock.py | 23 +++++++++--------
addons/sale_stock/sale_stock_data.xml | 11 --------
addons/sale_stock/sale_stock_demo.xml | 18 ++++++++++++-
addons/sale_stock/sale_stock_view.xml | 34 +++----------------------
9 files changed, 39 insertions(+), 66 deletions(-)
delete mode 100644 addons/sale_stock/sale_stock_data.xml
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index fe7c8752078..8636e2393da 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -151,6 +151,12 @@ class sale_order(osv.osv):
for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
result[line.order_id.id] = True
return result.keys()
+
+ def _get_default_company(self, cr, uid, context=None):
+ company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+ if not company_id:
+ raise osv.except_osv(_('Error!'), _('There is no default company for the current user!'))
+ return company_id
_columns = {
'name': fields.char('Order Reference', size=64, required=True,
@@ -220,6 +226,7 @@ class sale_order(osv.osv):
_defaults = {
'date_order': fields.date.context_today,
'order_policy': 'manual',
+ 'company_id': _get_default_company,
'state': 'draft',
'user_id': lambda obj, cr, uid, context: uid,
'name': lambda obj, cr, uid, context: '/',
diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index a849df295d4..fd20748aa75 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -57,7 +57,6 @@ You can choose flexible invoicing methods:
'report/sale_report_view.xml',
'process/sale_stock_process.xml',
],
- 'data': ['sale_stock_data.xml'],
'demo_xml': ['sale_stock_demo.xml'],
'test': ['test/cancel_order_sale_stock.yml',
'test/picking_order_policy.yml',
diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py
index ade84b269e6..d0f8510087c 100644
--- a/addons/sale_stock/report/sale_report.py
+++ b/addons/sale_stock/report/sale_report.py
@@ -57,7 +57,6 @@ class sale_report(osv.osv):
to_char(s.date_order, 'YYYY-MM-DD') as day,
s.partner_id as partner_id,
s.user_id as user_id,
- s.shop_id as shop_id,
s.company_id as company_id,
extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay,
s.state,
@@ -83,7 +82,6 @@ class sale_report(osv.osv):
s.date_confirm,
s.partner_id,
s.user_id,
- s.shop_id,
s.company_id,
s.state,
s.shipped,
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 3a6dcb404dd..5a0d9e36cf7 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -51,9 +51,6 @@ class sale_configuration(osv.osv_memory):
'group_mrp_properties': fields.boolean('Product properties on order lines',
implied_group='sale.group_mrp_properties',
help="Allows you to tag sales order lines with properties."),
- 'group_multiple_shops': fields.boolean("Manage multiple shops",
- implied_group='stock.group_locations',
- help="This allows to configure and use multiple shops."),
'module_project_timesheet': fields.boolean("Project Timesheet"),
'module_project_mrp': fields.boolean("Project MRP"),
}
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index ad3b91b2a30..93bc8e5980e 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -59,12 +59,6 @@
-
-
-
-
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 1b5ddefbe74..c2a52b8de7e 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -26,14 +26,6 @@ from openerp.osv import fields, osv
from openerp import netsvc
from openerp.tools.translate import _
-class sale_shop(osv.osv):
- _inherit = "sale.shop"
- _columns = {
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
- }
-
-sale_shop()
-
class sale_order(osv.osv):
_inherit = "sale.order"
@@ -72,6 +64,13 @@ class sale_order(osv.osv):
vals.update({'invoice_quantity': 'procurement'})
order = super(sale_order, self).create(cr, uid, vals, context=context)
return order
+
+ def _get_default_warehouse(self, cr, uid, context=None):
+ company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
+ warehouse_ids = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',company_id)], context=context)
+ if not warehouse_ids:
+ raise osv.except_osv(_('Error!'), _('There is no default location for the current user\'s company!'))
+ return warehouse_ids[0]
# This is False
def _picked_rate(self, cr, uid, ids, name, arg, context=None):
@@ -140,11 +139,13 @@ class sale_order(osv.osv):
'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."),
'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
+ 'warehouse_id': fields.many2one('stock.warehouse', 'Location'),
'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on',
help="The sales order will automatically create the invoice proposition (draft invoice).\
You have to choose if you want your invoice based on ordered ", required=True, readonly=True, states={'draft': [('readonly', False)]}),
}
_defaults = {
+ 'warehouse_id': _get_default_warehouse,
'picking_policy': 'direct',
'order_policy': 'manual',
'invoice_quantity': 'order',
@@ -276,7 +277,7 @@ class sale_order(osv.osv):
or line.product_uom_qty,
'product_uos': (line.product_uos and line.product_uos.id)\
or line.product_uom.id,
- 'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
+ 'location_id': order.warehouse_id.lot_stock_id.id,
'procure_method': line.type,
'move_id': move_id,
'company_id': order.company_id.id,
@@ -284,8 +285,8 @@ class sale_order(osv.osv):
}
def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
- location_id = order.shop_id.warehouse_id.lot_stock_id.id
- output_id = order.shop_id.warehouse_id.lot_output_id.id
+ location_id = order.warehouse_id.lot_stock_id.id
+ output_id = order.warehouse_id.lot_output_id.id
return {
'name': line.name,
'picking_id': picking_id,
diff --git a/addons/sale_stock/sale_stock_data.xml b/addons/sale_stock/sale_stock_data.xml
deleted file mode 100644
index bb4944bd87e..00000000000
--- a/addons/sale_stock/sale_stock_data.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/addons/sale_stock/sale_stock_demo.xml b/addons/sale_stock/sale_stock_demo.xml
index 15b1e60b829..2e7b641659d 100644
--- a/addons/sale_stock/sale_stock_demo.xml
+++ b/addons/sale_stock/sale_stock_demo.xml
@@ -3,21 +3,37 @@
+ prepaid
-
+
+
+
+
+
+
+
+ prepaid
+ picking
+ picking
+
+
+
-
- sale.shop.inherit.form
- sale.shop
-
-
-
-
-
-
-
- sale.shop.sale.stock
- sale.shop
-
-
-
-
-
-
-
-
sale.order.form.sale.stock
sale.order
@@ -48,17 +23,14 @@
-
-
-
@@ -78,7 +50,7 @@
groups="sale.group_mrp_properties"/>
-
@@ -823,7 +823,7 @@
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index 62250f11e17..41bb1a4e754 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -41,7 +41,7 @@ class pos_order_report(osv.osv):
'price_total':fields.float('Total Price', readonly=True),
'total_discount':fields.float('Total Discount', readonly=True),
'average_price': fields.float('Average Price', readonly=True,group_operator="avg"),
- 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True),
+ 'warehouse_id':fields.many2one('stock.warehouse', 'Location', readonly=True),
'company_id':fields.many2one('res.company', 'Company', readonly=True),
'nbr':fields.integer('# of Lines', readonly=True),
'product_qty':fields.integer('# of Qty', readonly=True),
@@ -69,7 +69,7 @@ class pos_order_report(osv.osv):
s.partner_id as partner_id,
s.state as state,
s.user_id as user_id,
- s.shop_id as shop_id,
+ s.warehouse_id as warehouse_id,
s.company_id as company_id,
s.sale_journal as journal_id,
l.product_id as product_id
@@ -80,7 +80,7 @@ class pos_order_report(osv.osv):
group by
to_char(s.date_order, 'dd-MM-YYYY'),to_char(s.date_order, 'YYYY'),to_char(s.date_order, 'MM'),
to_char(s.date_order, 'YYYY-MM-DD'), s.partner_id,s.state,
- s.user_id,s.shop_id,s.company_id,s.sale_journal,l.product_id,s.create_date
+ s.user_id,s.warehouse_id,s.company_id,s.sale_journal,l.product_id,s.create_date
having
sum(l.qty * u.factor) != 0)""")
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index 8d7bf84171a..135b6dcadaa 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -13,7 +13,7 @@
+
+
+
+
Date: Mon, 4 Feb 2013 18:09:09 +0530
Subject: [PATCH 11/72] [IMP]move warehouse field near company
bzr revid: sgo@tinyerp.com-20130204123909-xobft27wsauqgp4u
---
addons/sale_stock/sale_stock_view.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 4edde821729..38b54386827 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -26,7 +26,7 @@
-
+
From 9e99431d1fdb5772e5f53381d750f3c9a13b005a Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Wed, 6 Feb 2013 18:08:51 +0530
Subject: [PATCH 12/72] [IMP]add pricelist field in pos config and set default
bzr revid: sgo@tinyerp.com-20130206123851-4b3lhr5bzf7msla6
---
addons/point_of_sale/point_of_sale.py | 8 +++++++-
addons/point_of_sale/point_of_sale_view.xml | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index d95b64d5c84..6835576d253 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -70,6 +70,7 @@ class pos_config(osv.osv):
"to customize the reference numbers of your orders."),
'session_ids': fields.one2many('pos.session', 'config_id', 'Sessions'),
'group_by' : fields.boolean('Group Journal Items', help="Check this if you want to group the Journal Items by Product while closing a Session"),
+ 'pricelist_id': fields.many2one('product.pricelist','Pricelist', required=True)
}
def _check_cash_control(self, cr, uid, ids, context=None):
@@ -115,12 +116,17 @@ class pos_config(osv.osv):
def _default_warehouse(self, cr, uid, context=None):
res = self.pool.get('stock.warehouse').search(cr, uid, [])
return res and res[0] or False
+
+ def _default_pricelist(self, cr, uid, context=None):
+ res = self.pool.get('product.pricelist').search(cr, uid, [('type', '=', 'sale')])
+ return res and res[0] or False
_defaults = {
'state' : POS_CONFIG_STATE[0][0],
'warehouse_id': _default_warehouse,
'journal_id': _default_sale_journal,
'group_by' : True,
+ 'pricelist_id': _default_pricelist
}
def set_active(self, cr, uid, ids, context=None):
@@ -619,7 +625,7 @@ class pos_order(osv.osv):
session_ids = self._default_session(cr, uid, context)
if session_ids:
session_record = self.pool.get('pos.session').browse(cr, uid, session_ids, context=context)
- return session_record.user_id.partner_id.property_product_pricelist and session_record.user_id.partner_id.property_product_pricelist.id or False
+ return session_record.config_id.pricelist_id and session_record.config_id.pricelist_id.id or False
return False
_defaults = {
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 3cf920d8a11..6a8208bac0a 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -84,7 +84,7 @@
From d0e2c54663f9153a4333c6b03496b9cebb6779a5 Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Wed, 6 Feb 2013 18:29:13 +0530
Subject: [PATCH 13/72] [IMP]set config pricelist on pos frontend
bzr revid: sgo@tinyerp.com-20130206125913-ibn73y41aw19gkmw
---
addons/point_of_sale/static/src/js/models.js | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 5a4f7c8cefb..a43e5a28074 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -158,7 +158,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
return self.fetch(
'pos.config',
- ['name','journal_ids','warehouse_id','journal_id',
+ ['name','journal_ids','warehouse_id','journal_id','pricelist_id',
'iface_self_checkout', 'iface_led', 'iface_cashdrawer',
'iface_payment_terminal', 'iface_electronic_scale', 'iface_barscan', 'iface_vkeyboard',
'iface_print_via_proxy','iface_cashdrawer','state','sequence_id','session_ids'],
@@ -184,14 +184,13 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
return self.fetch('pos.category', ['id','name','parent_id','child_id','image'])
}).then(function(categories){
self.db.add_categories(categories);
- return new instance.web.Model("ir.model.data").call("get_object_reference", ["product", "list0"])
- }).then(function(pricelist){
+
return self.fetch(
'product.product',
['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13',
- 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description','pricelist_id'],
+ 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
[['sale_ok','=',true],['available_in_pos','=',true]],
- {pricelist: pricelist[1]} // context for price
+ {pricelist: self.get('pos_config').pricelist_id[0]} // context for price
);
}).then(function(products){
self.db.add_products(products);
From bc17621cecb4a36d4d4e6c6272b2e1b57e51fa1f Mon Sep 17 00:00:00 2001
From: "sgo@tinyerp.com" <>
Date: Thu, 7 Feb 2013 12:21:26 +0530
Subject: [PATCH 14/72] [IMP]improve pos config form view and add group on
warehouse
bzr revid: sgo@tinyerp.com-20130207065126-1liwmg1u3emnra6j
---
addons/point_of_sale/point_of_sale.py | 3 ++-
addons/point_of_sale/point_of_sale_view.xml | 23 ++++++++++++++-------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index e1fe577c922..ebb87d02f26 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -114,7 +114,8 @@ class pos_config(osv.osv):
return res and res[0] or False
def _default_warehouse(self, cr, uid, context=None):
- res = self.pool.get('stock.warehouse').search(cr, uid, [])
+ user = self.pool.get('res.users').browse(cr, uid, uid, context)
+ res = self.pool.get('stock.warehouse').search(cr, uid, [('company_id','=',user.company_id.id)], context)
return res and res[0] or False
def _default_pricelist(self, cr, uid, context=None):
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 6a8208bac0a..a3628761173 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -769,13 +769,20 @@
+
+
-
+
+
+
@@ -810,7 +817,7 @@
@@ -824,7 +831,7 @@