+
+
+
+
+
+
+
+ |
+ |
+
+
+
+
+
+
+ 
+ |
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+ |
+
+ |
+
+
+
+
+
+
+ 
+ |
+
+
+
+ |
+
-
-
+
project.task.tree
@@ -502,6 +511,21 @@
A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.
+
+
+ tree
+
+
+
+ form
+
+
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 302000950a1..74a78a9808a 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -226,6 +226,7 @@ class project_issue(crm.crm_case, osv.osv):
multi='compute_day', type="float", store=True),
'inactivity_days': fields.function(_compute_day, string='Days since last action', \
multi='compute_day', type="integer", help="Difference in days between last action and current date"),
+ 'color': fields.integer('Color Index'),
'message_ids': fields.one2many('mail.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
'date_action_last': fields.datetime('Last Action', readonly=1),
'date_action_next': fields.datetime('Next Action', readonly=1),
@@ -258,7 +259,22 @@ class project_issue(crm.crm_case, osv.osv):
'priority': crm.AVAILABLE_PRIORITIES[2][0],
'project_id':_get_project,
'categ_id' : lambda *a: False,
- }
+ }
+
+ def set_priority(self, cr, uid, ids, priority):
+ """Set lead priority
+ """
+ return self.write(cr, uid, ids, {'priority' : priority})
+
+ def set_high_priority(self, cr, uid, ids, *args):
+ """Set lead priority to high
+ """
+ return self.set_priority(cr, uid, ids, '1')
+
+ def set_normal_priority(self, cr, uid, ids, *args):
+ """Set lead priority to normal
+ """
+ return self.set_priority(cr, uid, ids, '3')
def convert_issue_task(self, cr, uid, ids, context=None):
case_obj = self.pool.get('project.issue')
diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml
index d404ed7f03f..b3be3d2c663 100644
--- a/addons/project_issue/project_issue_menu.xml
+++ b/addons/project_issue/project_issue_menu.xml
@@ -8,7 +8,7 @@
Issues
project.issue
form
- tree,calendar
+ tree,calendar,kanban
{"search_default_user_id": uid, "search_default_draft": 1, "search_default_project_id":project_id}
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 544606acb5d..916c67b15d4 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -260,6 +260,83 @@
+
+
+
+
+ Project Issue Kanban
+ project.issue
+ kanban
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# ------------------------------------------------------
# Feature Requests
# ------------------------------------------------------
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 696c4d708fe..29b4aa29318 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -124,68 +124,15 @@ class stock_picking(osv.osv):
purchase_obj.write(cursor, user, [picking.purchase_id.id], {'invoice_id': invoice_id,})
return super(stock_picking, self)._invoice_hook(cursor, user, picking, invoice_id)
-stock_picking()
-
class stock_partial_picking(osv.osv_memory):
_inherit = 'stock.partial.picking'
- def default_get(self, cr, uid, fields, context=None):
- """ To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- if context is None:
- context = {}
- pick_obj = self.pool.get('stock.picking')
- res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
- for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context=context):
- has_product_cost = (pick.type == 'in' and pick.purchase_id)
- for m in pick.move_lines:
- if m.state in ('done','cancel') :
- continue
- if has_product_cost and m.product_id.cost_method == 'average' and m.purchase_line_id:
- # We use the original PO unit purchase price as the basis for the cost, expressed
- # in the currency of the PO (i.e the PO's pricelist currency)
- list_index = 0
- for item in res['product_moves_in']:
- if item['move_id'] == m.id:
- res['product_moves_in'][list_index]['cost'] = m.purchase_line_id.price_unit
- res['product_moves_in'][list_index]['currency'] = m.picking_id.purchase_id.pricelist_id.currency_id.id
- list_index += 1
- return res
-stock_partial_picking()
+ # Overridden to inject the purchase price as true 'cost price' when processing
+ # incoming pickings.
+ def _product_cost_for_average_update(self, cr, uid, move):
+ if move.picking_id.purchase_id:
+ return {'cost': move.purchase_line_id.price_unit,
+ 'currency': move.picking_id.purchase_id.pricelist_id.currency_id.id}
+ return super(stock_partial_picking, self)._product_cost_for_average_update(cr, uid, move)
-class stock_partial_move(osv.osv_memory):
- _inherit = "stock.partial.move"
- def default_get(self, cr, uid, fields, context=None):
- """ To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- if context is None:
- context = {}
- res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
- move_obj = self.pool.get('stock.move')
- for m in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
- if m.picking_id.type == 'in' and m.product_id.cost_method == 'average' \
- and m.purchase_line_id and m.picking_id.purchase_id:
- # We use the original PO unit purchase price as the basis for the cost, expressed
- # in the currency of the PO (i.e the PO's pricelist currency)
- list_index = 0
- for item in res['product_moves_in']:
- if item['move_id'] == m.id:
- res['product_moves_in'][list_index]['cost'] = m.purchase_line_id.price_unit
- res['product_moves_in'][list_index]['currency'] = m.picking_id.purchase_id.pricelist_id.currency_id.id
- list_index += 1
- return res
-stock_partial_move()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml
index 9425ad94812..8d63aa3e02c 100644
--- a/addons/purchase/test/purchase_from_picking.yml
+++ b/addons/purchase/test/purchase_from_picking.yml
@@ -137,7 +137,7 @@
pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2"))
pick_ids = [x.id for x in pur_id1.picking_ids]
id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.expenses_journal')},
- {'active_ids': pick_ids})
+ {'active_ids': pick_ids, 'active_model': 'stock.picking'})
self.create_invoice(cr, uid, [id], {"active_ids": pick_ids, "active_id": pick_ids[0]})
-
I check that an invoice_ids field of Delivery&Invoices gets bind with the value.
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index 41f7534c8e2..4622577ac3d 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -13,11 +13,15 @@
Resource: sale.shop
-->
-
\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 04:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:19+0000\n"
+"X-Generator: Launchpad (build 14049)\n"
#. module: stock
#: field:product.product,track_outgoing:0
@@ -163,7 +163,7 @@ msgstr ""
#: view:report.stock.move:0
#: field:stock.change.standard.price,stock_journal:0
msgid "Stock journal"
-msgstr ""
+msgstr "庫存日誌"
#. module: stock
#: view:report.stock.move:0
@@ -475,7 +475,7 @@ msgstr "調動統計"
#. module: stock
#: view:stock.production.lot:0
msgid "Product Lots Filter"
-msgstr ""
+msgstr "生產批次篩選"
#. module: stock
#: report:lot.stock.overview:0
@@ -636,7 +636,7 @@ msgstr ""
#. module: stock
#: constraint:stock.move:0
msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "指定了不同產品的批次"
#. module: stock
#: view:res.partner:0
@@ -1152,7 +1152,7 @@ msgstr ""
#: code:addons/stock/stock.py:1319
#, python-format
msgid "is in draft state."
-msgstr "尚在草案階段"
+msgstr "尚在草案階段。"
#. module: stock
#: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1402,6 +1402,12 @@ msgid ""
"* Done: has been processed, can't be modified or cancelled anymore\n"
"* Cancelled: has been cancelled, can't be confirmed anymore"
msgstr ""
+"* 草案(Draft): 未確認，不會安排處理直至確認\n"
+"* 確認(Confirmed): 仍等候產品有貨供應\n"
+"* 供貨(Available): 已預留產品，只等候確認\n"
+"* 等待(Waiting): 自動供貨前要再等候下一步 (如於「接單生產(Make-To-Order)」流程)\n"
+"* 完成(Done): 已處理，無法再修改或取消\n"
+"* 取消(Cancelled): 已取消，無法再確認"
#. module: stock
#: help:stock.location,company_id:0
@@ -1440,6 +1446,11 @@ msgid ""
" When the picking is done the state is 'Done'. \n"
"The state is 'Waiting' if the move is waiting for another one."
msgstr ""
+"建立調動時先處於「草案(Draft)」狀態。\n"
+" 然後，如安排者找不到貨，設為「無貨(Not Available)」狀態。\n"
+" 當已預留貨物，變成「供貨(Available)」。\n"
+" 完成提貨後狀態為「完成(Done)」。 \n"
+"如調動正等候其他工作完成，狀態為「等待(Waiting)」。"
#. module: stock
#: selection:report.stock.inventory,location_type:0
@@ -1486,7 +1497,7 @@ msgstr "貨幣"
#. module: stock
#: field:product.product,track_production:0
msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "追蹤生產批次"
#. module: stock
#: code:addons/stock/wizard/stock_inventory_merge.py:44
@@ -1537,7 +1548,7 @@ msgstr "貨架 2"
#. module: stock
#: field:stock.report.tracklots,tracking_id:0
msgid "Tracking lot"
-msgstr ""
+msgstr "追蹤批次"
#. module: stock
#: view:stock.picking:0
@@ -1558,7 +1569,7 @@ msgstr "本地化"
#. module: stock
#: model:ir.model,name:stock.model_stock_report_tracklots
msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "按追蹤批次庫存報告"
#. module: stock
#: code:addons/stock/product.py:370
@@ -2119,7 +2130,7 @@ msgstr ""
#: code:addons/stock/stock.py:2210
#, python-format
msgid "You can only delete draft moves."
-msgstr "不能刪除調動草案"
+msgstr "只能刪除調動草案。"
#. module: stock
#: code:addons/stock/wizard/stock_partial_picking.py:97
@@ -2542,7 +2553,7 @@ msgstr "數量（量度單位）"
#, python-format
msgid ""
"You are moving %.2f %s products but only %.2f %s available in this lot."
-msgstr ""
+msgstr "您正移動%.2f件 %s 產品，但此批次只有%.2f件 %s。"
#. module: stock
#: view:stock.move:0
@@ -3032,7 +3043,7 @@ msgstr ""
#. module: stock
#: view:stock.inventory:0
msgid "Lot Inventory"
-msgstr ""
+msgstr "批次存貨"
#. module: stock
#: view:stock.move:0
@@ -3501,6 +3512,11 @@ msgid ""
" When the picking it done the state is 'Done'. \n"
"The state is 'Waiting' if the move is waiting for another one."
msgstr ""
+"建立調動時先處於「草案(Draft)」狀態。\n"
+" 然後設為「確認(Confirmed)」狀態。\n"
+" 如庫存有貨，變成「供貨(Available)」。\n"
+" 完成提貨後狀態為「完成(Done)」。 \n"
+"如調動正等候其他工作完成，狀態為「等待(Waiting)」。"
#. module: stock
#: view:board.board:0
@@ -3720,7 +3736,7 @@ msgstr ""
#. module: stock
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
-msgstr "須為此產品分配生產批次"
+msgstr "須為此產品指定生產批次"
#. module: stock
#: view:stock.move:0
@@ -3817,7 +3833,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_report_prodlots
msgid "Stock report by production lots"
-msgstr "生產批次回報之庫存"
+msgstr "按生產批次庫存報告"
#. module: stock
#: view:stock.location:0
@@ -3878,7 +3894,7 @@ msgstr "輸出"
#. module: stock
#: selection:stock.move.split.lines,action:0
msgid "Keep in one lot"
-msgstr ""
+msgstr "保持為同一批次"
#. module: stock
#: view:product.product:0
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 80d7ed6efa0..a0059ce60d3 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -120,6 +120,67 @@
+
+
+ Product Kanban
+ product.product
+ kanban
+
+
+
+
+
+
+
+
+
product.normal.stock.property.form.inherit
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2dbfc5105c1..d9debe6641b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -664,8 +664,8 @@ class stock_picking(osv.osv):
def action_process(self, cr, uid, ids, context=None):
if context is None: context = {}
- partial_id = self.pool.get("stock.partial.picking").create(
- cr, uid, {}, context=dict(context, active_ids=ids))
+ context = dict(context, active_ids=ids, active_model=self._name)
+ partial_id = self.pool.get("stock.partial.picking").create(cr, uid, {}, context=context)
return {
'name':_("Products to Process"),
'view_mode': 'form',
@@ -677,7 +677,7 @@ class stock_picking(osv.osv):
'nodestroy': True,
'target': 'new',
'domain': '[]',
- 'context': dict(context, active_ids=ids)
+ 'context': context,
}
def copy(self, cr, uid, id, default=None, context=None):
@@ -1474,6 +1474,8 @@ class stock_move(osv.osv):
def action_partial_move(self, cr, uid, ids, context=None):
if context is None: context = {}
+ if context.get('active_model') != self._name:
+ context.update(active_ids=ids, active_model=self._name)
partial_id = self.pool.get("stock.partial.move").create(
cr, uid, {}, context=context)
return {
@@ -2127,14 +2129,9 @@ class stock_move(osv.osv):
""" Makes the move done and if all moves are done, it will finish the picking.
@return:
"""
- partial_datas=''
picking_ids = []
move_ids = []
- partial_obj=self.pool.get('stock.partial.picking')
wf_service = netsvc.LocalService("workflow")
- partial_id=partial_obj.search(cr,uid,[])
- if partial_id:
- partial_datas = partial_obj.read(cr, uid, partial_id, context=context)[0]
if context is None:
context = {}
@@ -2164,9 +2161,6 @@ class stock_move(osv.osv):
self.action_done(cr, uid, [move.move_dest_id.id], context=context)
self._create_product_valuation_moves(cr, uid, move, context=context)
- prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
- if prodlot_id:
- self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
if move.state not in ('confirmed','done','assigned'):
todo.append(move.id)
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index bcde818c78a..c0c872e99f2 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -2,12 +2,17 @@
+
+ Stock Journal Sequence
+ STJ/%(year)s/
+
Stock Journal
STJ
general
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index ebd3c6670b4..63650ffeb38 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -184,37 +184,32 @@
self.fill_inventory(cr, uid, [ref("stock_fill_inventory_0")], context)
-
- I create stock.inventory.line.split record.
+ I split the PC3 inventory line to create 5 PC3 with production lot 00002-stock-test
-
!record {model: stock.inventory.line.split, id: stock_inventory_line_0}:
line_ids:
- name: '00002-stock-test'
quantity: 5
- line_exist_ids:
- - name: '00003-stock-test'
- quantity: 5
product_id: product.product_product_pc1
product_uom: product.product_uom_unit
use_exist: False
qty: 10
-
-
- I Split stock.inventory.line into production line.
+ I confirm the split operation
-
- !python {model: stock.inventory.line.split}: |
- context = {"lang": 'en_US', "active_model": "stock.inventory.line",
- "active_ids": [ref("stock_inventory_line_0")], "tz": False, "active_id": ref("stock_inventory_line_0")}
- self.default_get(cr, uid, ["product_id", "product_uom", "line_exist_ids", "qty",
- "line_ids", "use_exist"], context)
- self.split_lot(cr, uid, [ref("stock_inventory_line_0")], context)
-
+ !python {model: stock.inventory.line}: |
+ line_ids = self.search(cr, uid, [('inventory_id','=',ref('stock_inventory_physicalinventoy0')),
+ ('product_id','=',ref('product.product_product_pc1'))])
+ assert line_ids, 'Inventory lines are missing'
+ self.pool.get('stock.inventory.line.split').split_lot(cr, uid, [ref("stock_inventory_line_0")],
+ {'active_model': 'stock.inventory.line',
+ 'active_ids': [line_ids[0]]})
-
I confirm the Inventory for PC3.
-
!python {model: stock.inventory}: |
self.action_confirm(cr,uid,[ref('stock_inventory_physicalinventoy0')])
self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')])
-
-
I cancel the Inventory for PC3.
-
@@ -251,7 +246,7 @@
type: out
-
- I Performing an osv_memory action split on module stock.split.into
+ I split the picking with a first batch of 20 PCs
-
!python {model: stock.picking }: |
pick=self.browse(cr,uid,ref('stock_picking_0'))
@@ -285,31 +280,15 @@
ref("stock.menu_action_picking_tree6"), })
-
- I create a record for stock.partial.move.
+ I process the partial picking with 20 PCE
-
- !record {model: stock.partial.move, id: stock_partial_move_0}:
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-
--
- I done stock.partial.move record.
--
- !python {model: stock.partial.move }: |
- pick_obj = self.pool.get('stock.picking')
- move_obj = self.pool.get('stock.move')
- pick=pick_obj.browse(cr,uid,ref('stock_picking_0'))
- search_id = move_obj.search(cr, uid, [('picking_id', '=', pick.id)])
- partial_datas={}
- for move in pick.move_lines:
- partial_datas['move%s'%(move.id)]= {
- 'quantity': 20,
- 'product_uom': move.product_uom.id,
- 'prodlot_id': move.prodlot_id and move.prodlot_id.id or False,
- 'wizard_id': ref('stock_partial_move_0'),
- }
- context = {"lang": 'en_US', "active_model": "stock.move", "active_ids": search_id, "tz": False, "active_id":search_id[0]}
- self.fields_view_get(cr, uid, False,"form", context)
- self.do_partial(cr, uid, [ref('stock_partial_move_0')], context)
-
+ !python {model: stock.picking }: |
+ pick = self.browse(cr,uid,ref('stock_picking_0'))
+ stock_partial_move = self.pool.get('stock.partial.move')
+ partial_id = stock_partial_move.create(cr, uid, {},
+ context={'active_model': 'stock.move',
+ 'active_ids': [x.id for x in pick.move_lines]})
+ stock_partial_move.do_partial(cr, uid, [partial_id])
-
I Performing an osv_memory action split_lot on module stock.move.split
-
@@ -384,34 +363,14 @@
consume_obj.do_move_consume(cr, uid, [consume_id], context)
-
- I create a record for stock partial picking.
+ I process the picking with the 80 remaining PCs
-
- !record {model: stock.partial.picking, id: stock_partial_picking_0}:
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
-
--
- I make stock partial picking order Done.
--
- !python {model: stock.partial.picking}: |
- pick_obj = self.pool.get('stock.picking')
- partial = self.browse(cr, uid, ref('stock_partial_picking_0'), context)
- partial_datas = {
- 'delivery_date' : partial.date
- }
- for pick in pick_obj.browse(cr, uid, [ref('stock_picking_0')]):
- for m in pick.move_lines:
- partial_datas['move%s'%(m.id)] = {
- 'product_id' : m.product_id.id,
- 'product_qty' : 80,
- 'product_uom' : m.product_uom.id
- }
- context = {"lang": "en_US", "search_default_available":
- 1, "tz": False, "active_model": "ir.ui.menu",
- "active_ids": [ref('stock_picking_0')], "active_id": ref("stock_picking_0"),
- }
- self.fields_view_get(cr, uid, False,"form", context)
- self.do_partial(cr, uid, [ref('stock_partial_picking_0')], context)
-
+ !python {model: stock.picking}: |
+ stock_partial_picking = self.pool.get('stock.partial.picking')
+ partial_id = stock_partial_picking.create(cr, uid, {},
+ context={'active_model': 'stock.picking',
+ 'active_ids': [ref('stock_picking_0')]})
+ stock_partial_picking.do_partial(cr, uid, [partial_id])
-
I Performing an osv_memory action create_invoice on module stock.invoice.onshipping
-
@@ -447,35 +406,20 @@
1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner_address",
"active_ids": [ref("stock.menu_action_picking_tree4")], "active_id": ref("stock.menu_action_picking_tree4"),
})
- pick=self.browse(cr,uid,copy_id)
self.allow_cancel(cr, uid, [copy_id], context= None)
-
- I create a record of stock.picking and I reaturn the picking
+ I process a copy of the picking and I return it
-
!python {model: stock.picking}: |
copy_id = self.copy(cr, uid, (ref("stock_picking_0")))
- ctx = {"lang": "en_US", "active_model":
- "ir.ui.menu", "tz": False, "search_default_confirmed": 1, "contact_display":
- "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id":
- ref("stock.menu_action_picking_tree6")}
- self.draft_force_assign(cr, uid, [copy_id], ctx)
- self.force_assign(cr, uid, [copy_id], ctx)
- pick=self.browse(cr,uid,copy_id)
- partial_datas={}
- for move in pick.move_lines:
- partial_datas['move%s'%(move.id)]= {
- 'product_id': move.product_id,
- 'product_qty': move.product_qty,
- }
- self.do_partial(cr, uid, [pick.id],partial_datas)
- reurn_datas={}
- context = {"lang": 'en_US', "active_model":
- "stock.picking", "active_ids": [pick.id], "tz": False, "active_id":pick.id}
+ self.draft_force_assign(cr, uid, [copy_id])
+ self.force_assign(cr, uid, [copy_id])
+ stock_partial_picking = self.pool.get('stock.partial.picking')
+ context = {'active_model': 'stock.picking',
+ 'active_ids': [copy_id],
+ 'active_id': copy_id}
+ partial_id = stock_partial_picking.create(cr, uid, {}, context=context)
+ stock_partial_picking.do_partial(cr, uid, [partial_id], context)
return_pick_id = self.pool.get('stock.return.picking').create(cr, uid,{}, context)
- for move in pick.move_lines:
- reurn_datas= {
- 'product_id': move.product_id.id,
- 'quantity': move.product_qty,
- }
self.pool.get('stock.return.picking').create_returns(cr, uid, [return_pick_id], context)
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 2e8b93ad52b..ae4ce54ab9b 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -21,24 +21,17 @@
from osv import fields, osv
-from tools.translate import _
-import time
-
class stock_inventory_line_split(osv.osv_memory):
_inherit = "stock.move.split"
_name = "stock.inventory.line.split"
_description = "Split inventory lines"
+ _columns = {
+ 'line_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_id', 'Production Lots'),
+ 'line_exist_ids': fields.one2many('stock.inventory.line.split.lines', 'wizard_exist_id', 'Production Lots'),
+ }
def default_get(self, cr, uid, fields, context=None):
- """ To check the availability of production lot.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
if context is None:
context = {}
record_id = context and context.get('active_id',False)
@@ -54,14 +47,13 @@ class stock_inventory_line_split(osv.osv_memory):
def split(self, cr, uid, ids, line_ids, context=None):
""" To split stock inventory lines according to production lot.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param line_ids: the ID or list of IDs of inventory lines we want to split
- @param context: A standard dictionary
- @return:
+
+ :param line_ids: the ID or list of IDs of inventory lines we want to split
"""
+ if context is None:
+ context = {}
+ assert context.get('active_model') == 'stock.inventory.line',\
+ 'Incorrect use of the inventory line split wizard'
prodlot_obj = self.pool.get('stock.production.lot')
ir_sequence_obj = self.pool.get('ir.sequence')
line_obj = self.pool.get('stock.inventory.line')
@@ -108,7 +100,14 @@ class stock_inventory_line_split(osv.osv_memory):
line_obj.write(cr, uid, [inv_line.id], update_val)
return new_line
-stock_inventory_line_split()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class stock_inventory_split_lines(osv.osv_memory):
+ _inherit = "stock.move.split.lines"
+ _name = "stock.inventory.line.split.lines"
+ _description = "Inventory Split lines"
+ _columns = {
+ 'wizard_id': fields.many2one('stock.inventory.line.split', 'Parent Wizard'),
+ 'wizard_exist_id': fields.many2one('stock.inventory.line.split', 'Parent Wizard'),
+ }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 66256509c7b..f4618249e37 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -28,7 +28,7 @@ class stock_invoice_onshipping(osv.osv_memory):
def _get_journal(self, cr, uid, context=None):
res = self._get_journal_id(cr, uid, context=context)
if res:
- return res[0]
+ return res[0][0]
return False
def _get_journal_id(self, cr, uid, context=None):
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 1e3d26b4194..1a655878d8a 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -146,14 +146,6 @@ class split_in_production_lot(osv.osv_memory):
_description = "Split in Production lots"
def default_get(self, cr, uid, fields, context=None):
- """ Get default values
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for default value
- @param context: A standard dictionary
- @return: Default values of fields
- """
if context is None:
context = {}
res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
@@ -175,21 +167,14 @@ class split_in_production_lot(osv.osv_memory):
'qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
'product_id': fields.many2one('product.product', 'Product', required=True, select=True),
'product_uom': fields.many2one('product.uom', 'UoM'),
- 'line_ids': fields.one2many('stock.move.split.lines', 'lot_id', 'Production Lots'),
- 'line_exist_ids': fields.one2many('stock.move.split.lines.exist', 'lot_id', 'Production Lots'),
+ 'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Production Lots'),
+ 'line_exist_ids': fields.one2many('stock.move.split.lines', 'wizard_exist_id', 'Production Lots'),
'use_exist' : fields.boolean('Existing Lots', help="Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."),
'location_id': fields.many2one('stock.location', 'Source Location')
}
def split_lot(self, cr, uid, ids, context=None):
- """ To split a lot
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: An ID or list of IDs if we want more than one
- @param context: A standard dictionary
- @return:
- """
+ """ To split a lot"""
if context is None:
context = {}
res = self.split(cr, uid, ids, context.get('active_ids'), context=context)
@@ -197,16 +182,13 @@ class split_in_production_lot(osv.osv_memory):
def split(self, cr, uid, ids, move_ids, context=None):
""" To split stock moves into production lot
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: the ID or list of IDs if we want more than one
- @param move_ids: the ID or list of IDs of stock move we want to split
- @param context: A standard dictionary
- @return:
+
+ :param move_ids: the ID or list of IDs of stock move we want to split
"""
if context is None:
context = {}
+ assert context.get('active_model') == 'stock.move',\
+ 'Incorrect use of the stock move split wizard'
inventory_id = context.get('inventory_id', False)
prodlot_obj = self.pool.get('stock.production.lot')
inventory_obj = self.pool.get('stock.inventory')
@@ -269,12 +251,13 @@ class split_in_production_lot(osv.osv_memory):
split_in_production_lot()
class stock_move_split_lines_exist(osv.osv_memory):
- _name = "stock.move.split.lines.exist"
- _description = "Exist Split lines"
+ _name = "stock.move.split.lines"
+ _description = "Stock move Split lines"
_columns = {
'name': fields.char('Tracking serial', size=64),
'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
- 'lot_id': fields.many2one('stock.move.split', 'Lot'),
+ 'wizard_id': fields.many2one('stock.move.split', 'Parent Wizard'),
+ 'wizard_exist_id': fields.many2one('stock.move.split', 'Parent Wizard (for existing lines)'),
'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot'),
}
_defaults = {
@@ -285,21 +268,3 @@ class stock_move_split_lines_exist(osv.osv_memory):
loc_id=False, product_id=False, uom_id=False):
return self.pool.get('stock.move').onchange_lot_id(cr, uid, [], prodlot_id, product_qty,
loc_id, product_id, uom_id)
-
-stock_move_split_lines_exist()
-
-class stock_move_split_lines(osv.osv_memory):
- _name = "stock.move.split.lines"
- _description = "Split lines"
- _columns = {
- 'name': fields.char('Tracking serial', size=64),
- 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')),
- 'use_exist' : fields.boolean('Existing Lot'),
- 'lot_id': fields.many2one('stock.move.split', 'Lot'),
- 'action': fields.selection([('split','Split'),('keepinone','Keep in one lot')],'Action'),
- }
- _defaults = {
- 'quantity': 1.00,
- 'action' : 'split',
- }
-stock_move_split_lines()
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index 2c593e811c5..ec348656ce0 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
+# Copyright (C) 2004-TODAY OpenERP SA ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -20,210 +20,65 @@
##############################################################################
from osv import fields, osv
-from tools.translate import _
+from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
import time
-import decimal_precision as dp
-
-class stock_partial_move_memory_out(osv.osv_memory):
- _name = "stock.move.memory.out"
- _rec_name = 'product_id'
+class stock_partial_move_line(osv.osv_memory):
+ _inherit = "stock.partial.picking.line"
+ _name = "stock.partial.move.line"
_columns = {
- 'product_id' : fields.many2one('product.product', string="Product", required=True),
- 'quantity' : fields.float("Quantity", required=True),
- 'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True),
- 'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot'),
- 'location_id': fields.many2one('stock.location', 'Location', required=True),
- 'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True),
- 'move_id' : fields.many2one('stock.move', "Move"),
- 'wizard_id' : fields.many2one('stock.partial.move', string="Wizard"),
- 'cost' : fields.float('Cost', digits_compute = dp.get_precision('Purchase Price'),help="Unit Cost for this product line"),
- 'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed"),
+ 'wizard_id' : fields.many2one('stock.partial.move', string="Wizard", ondelete='CASCADE'),
}
-
-class stock_partial_move_memory_in(osv.osv_memory):
- _inherit = "stock.move.memory.out"
- _name = "stock.move.memory.in"
-
+
class stock_partial_move(osv.osv_memory):
_name = "stock.partial.move"
- _description = "Partial Move"
+ _inherit = 'stock.partial.picking'
+ _description = "Partial Move Processing Wizard"
_columns = {
'date': fields.datetime('Date', required=True),
- 'type': fields.char("Type", size=3),
- 'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
- 'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
- }
-
-
- def __is_in(self,cr, uid, move_ids):
- """
- @return: True if one of the moves has as picking type 'in'
- """
- if not move_ids:
- return False
-
- move_obj = self.pool.get('stock.move')
- move_ids = move_obj.search(cr, uid, [('id','in',move_ids)])
-
- for move in move_obj.browse(cr, uid, move_ids):
- if move.picking_id.type == 'in' and move.product_id.cost_method == 'average':
- return True
- return False
-
- def __get_picking_type(self, cr, uid, move_ids):
- if self.__is_in(cr, uid, move_ids):
- return "product_moves_in"
- else:
- return "product_moves_out"
-
- def view_init(self, cr, uid, fields_list, context=None):
- res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
- move_obj = self.pool.get('stock.move')
-
- if context is None:
- context = {}
- for move in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
- if move.state in ('done', 'cancel'):
- raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
-
- return res
-
-
- def __create_partial_move_memory(self, move):
- move_memory = {
- 'product_id' : move.product_id.id,
- 'quantity' : move.product_qty,
- 'product_uom' : move.product_uom.id,
- 'prodlot_id' : move.prodlot_id.id,
- 'move_id' : move.id,
- }
-
- if move.picking_id.type == 'in':
- move_memory.update({
- 'cost' : move.product_id.standard_price,
- 'currency' : move.product_id.company_id and move.product_id.company_id.currency_id and move.product_id.company_id.currency_id.id or False,
- })
- return move_memory
+ 'move_ids' : fields.one2many('stock.partial.move.line', 'wizard_id', 'Moves'),
- def __get_active_stock_moves(self, cr, uid, context=None):
- move_obj = self.pool.get('stock.move')
- if context is None:
- context = {}
-
- res = []
- for move in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
- if move.state in ('done', 'cancel'):
- continue
- res.append(self.__create_partial_move_memory(move))
-
+ # picking_id is not used for move processing, so we remove the required attribute
+ # from the inherited column, and ignore it
+ 'picking_id': fields.many2one('stock.picking', 'Picking'),
+ }
+
+ def default_get(self, cr, uid, fields, context=None):
+ if context is None: context = {}
+ # no call to super!
+ res = {}
+ move_ids = context.get('active_ids', [])
+ if not move_ids or not context.get('active_model') == 'stock.move':
+ return res
+ if 'move_ids' in fields:
+ move_ids = self.pool.get('stock.move').browse(cr, uid, move_ids, context=context)
+ moves = [self._partial_move_for(cr, uid, m) for m in move_ids if m.state not in ('done','cancel')]
+ res.update(move_ids=moves)
+ if 'date' in fields:
+ res.update(date=time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))
return res
-
- _defaults = {
- 'product_moves_in' : __get_active_stock_moves,
- 'product_moves_out' : __get_active_stock_moves,
- 'date' : lambda *a : time.strftime('%Y-%m-%d %H:%M:%S'),
- }
-
-
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- if not context:
- context = {}
-
- message = {
- 'title' : _('Deliver Products'),
- 'info' : _('Delivery Information'),
- 'button' : _('Deliver'),
- }
- if context:
- if context.get('product_receive', False):
- message = {
- 'title' : _('Receive Products'),
- 'info' : _('Receive Information'),
- 'button' : _('Receive'),
- }
-
- move_ids = context.get('active_ids', False)
- message['picking_type'] = self.__get_picking_type(cr, uid, move_ids)
- result = super(stock_partial_move, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
- _moves_fields = result['fields']
- _moves_fields.update({
- 'product_moves_in' : {'relation': 'stock.move.memory.in', 'type' : 'one2many', 'string' : 'Product Moves'},
- 'product_moves_out' : {'relation': 'stock.move.memory.out', 'type' : 'one2many', 'string' : 'Product Moves'}
- })
-
- _moves_arch_lst = """
- """ % message
-
- result['arch'] = _moves_arch_lst
- result['fields'] = _moves_fields
- return result
-
+
def do_partial(self, cr, uid, ids, context=None):
- """ Makes partial moves and pickings done.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
-
- if context is None:
- context = {}
- move_obj = self.pool.get('stock.move')
-
- move_ids = context.get('active_ids', False)
+ # no call to super!
+ assert len(ids) == 1, 'Partial move processing may only be done one form at a time'
partial = self.browse(cr, uid, ids[0], context=context)
- partial_datas = {
+ partial_data = {
'delivery_date' : partial.date
}
-
- p_moves = {}
- picking_type = self.__get_picking_type(cr, uid, move_ids)
-
- moves_list = picking_type == 'product_moves_in' and partial.product_moves_in or partial.product_moves_out
- for product_move in moves_list:
- p_moves[product_move.move_id.id] = product_move
-
- moves_ids_final = []
- for move in move_obj.browse(cr, uid, move_ids, context=context):
- if move.state in ('done', 'cancel'):
- continue
- if not p_moves.get(move.id):
- continue
- partial_datas['move%s' % (move.id)] = {
- 'product_id' : p_moves[move.id].product_id.id,
- 'product_qty' : p_moves[move.id].quantity,
- 'product_uom' :p_moves[move.id].product_uom.id,
- 'prodlot_id' : p_moves[move.id].prodlot_id.id,
+ moves_ids = []
+ for move in partial.move_ids:
+ move_id = move.move_id.id
+ partial_data['move%s' % (move_id)] = {
+ 'product_id': move.product_id.id,
+ 'product_qty': move.quantity,
+ 'product_uom': move.product_uom.id,
+ 'prodlot_id': move.prodlot_id.id,
}
-
- moves_ids_final.append(move.id)
- if (move.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
- partial_datas['move%s' % (move.id)].update({
- 'product_price' : p_moves[move.id].cost,
- 'product_currency': p_moves[move.id].currency.id,
- })
-
-
- move_obj.do_partial(cr, uid, moves_ids_final, partial_datas, context=context)
+ moves_ids.append(move_id)
+ if (move.move_id.picking_id.type == 'in') and (move.product_id.cost_method == 'average'):
+ partial_data['move%s' % (move_id)].update(product_price=move.cost,
+ product_currency=move.currency.id)
+ self.pool.get('stock.move').do_partial(cr, uid, moves_ids, partial_data, context=context)
return {'type': 'ir.actions.act_window_close'}
-stock_partial_move()
-stock_partial_move_memory_out()
-stock_partial_move_memory_in()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index 8d4be66b243..2df6adcc9e7 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -1,16 +1,13 @@
-
-
-
Deliver/Receive Products
code
action = obj.action_partial_move(context=context)
-
+
-
-
-
- stock.move.memory.tree
- stock.move.memory.in
- tree
-
-
-
-
-
-
-
- stock.move.memory.form
- stock.move.memory.in
+
+ stock.partial.move.form
+ stock.partial.move
form
-
-
-
-
- stock.move.memory.tree
- stock.move.memory.out
- tree
-
-
-
-
-
-
-
- stock.move.memory.form
- stock.move.memory.out
- form
-
-
-
-
+
+
+
+ stock.partial.move.line.list
+ stock.partial.move.line
+ tree
+
+
+
+
+
+
+
+ stock.partial.move.line.form
+ stock.partial.move.line
+ form
+
+
+
+
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 9ac3fab9f72..3580b21035d 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -1,9 +1,8 @@
-
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
+# Copyright (C) 2004-TODAY OpenERP SA ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -20,169 +19,119 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
import time
+from osv import fields, osv
+from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+
+class stock_partial_picking_line(osv.TransientModel):
+ _name = "stock.partial.picking.line"
+ _rec_name = 'product_id'
+ _columns = {
+ 'product_id' : fields.many2one('product.product', string="Product", required=True, ondelete='CASCADE'),
+ 'quantity' : fields.float("Quantity", required=True),
+ 'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, ondelete='CASCADE'),
+ 'prodlot_id' : fields.many2one('stock.production.lot', 'Production Lot', ondelete='CASCADE'),
+ 'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete='CASCADE'),
+ 'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, ondelete='CASCADE'),
+ 'move_id' : fields.many2one('stock.move', "Move", ondelete='CASCADE'),
+ 'wizard_id' : fields.many2one('stock.partial.picking', string="Wizard", ondelete='CASCADE'),
+ 'update_cost': fields.boolean('Need cost update'),
+ 'cost' : fields.float("Cost", help="Unit Cost for this product line"),
+ 'currency' : fields.many2one('res.currency', string="Currency", help="Currency in which Unit cost is expressed", ondelete='CASCADE'),
+ }
class stock_partial_picking(osv.osv_memory):
_name = "stock.partial.picking"
- _description = "Partial Picking"
+ _description = "Partial Picking Processing Wizard"
_columns = {
'date': fields.datetime('Date', required=True),
- 'product_moves_out' : fields.one2many('stock.move.memory.out', 'wizard_id', 'Moves'),
- 'product_moves_in' : fields.one2many('stock.move.memory.in', 'wizard_id', 'Moves'),
+ 'move_ids' : fields.one2many('stock.partial.picking.line', 'wizard_id', 'Product Moves'),
+ 'picking_id': fields.many2one('stock.picking', 'Picking', required=True, ondelete='CASCADE'),
}
-
- def get_picking_type(self, cr, uid, picking, context=None):
- picking_type = picking.type
- for move in picking.move_lines:
- if picking.type == 'in' and move.product_id.cost_method == 'average':
- picking_type = 'in'
- break
- else:
- picking_type = 'out'
- return picking_type
-
+
def default_get(self, cr, uid, fields, context=None):
- """ To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- if context is None:
- context = {}
-
- pick_obj = self.pool.get('stock.picking')
+ if context is None: context = {}
res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
picking_ids = context.get('active_ids', [])
- if not picking_ids:
+ if not picking_ids or (not context.get('active_model') == 'stock.picking') \
+ or len(picking_ids) != 1:
+ # Partial Picking Processing may only be done for one picking at a time
return res
-
- result = []
- for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
- pick_type = self.get_picking_type(cr, uid, pick, context=context)
- for m in pick.move_lines:
- if m.state in ('done', 'cancel'):
- continue
- result.append(self.__create_partial_picking_memory(m, pick_type))
-
- if 'product_moves_in' in fields:
- res.update({'product_moves_in': result})
- if 'product_moves_out' in fields:
- res.update({'product_moves_out': result})
+ picking_id, = picking_ids
+ if 'picking_id' in fields:
+ res.update(picking_id=picking_id)
+ if 'move_ids' in fields:
+ picking = self.pool.get('stock.picking').browse(cr, uid, picking_id, context=context)
+ moves = [self._partial_move_for(cr, uid, m) for m in picking.move_lines if m.state not in ('done','cancel')]
+ res.update(move_ids=moves)
if 'date' in fields:
- res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
+ res.update(date=time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))
return res
-
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- result = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-
- pick_obj = self.pool.get('stock.picking')
- picking_ids = context.get('active_ids', False)
- if not picking_ids:
- # not called through an action (e.g. buildbot), return the default.
- return result
-
- for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
- picking_type = self.get_picking_type(cr, uid, pick, context=context)
+ def _product_cost_for_average_update(self, cr, uid, move):
+ """Returns product cost and currency ID for the given move, suited for re-computing
+ the average product cost.
- _moves_arch_lst = """"""
- result['arch'] = _moves_arch_lst
- result['fields'] = _moves_fields
- return result
-
- def __create_partial_picking_memory(self, picking, pick_type):
- move_memory = {
- 'product_id' : picking.product_id.id,
- 'quantity' : picking.product_qty,
- 'product_uom' : picking.product_uom.id,
- 'prodlot_id' : picking.prodlot_id.id,
- 'move_id' : picking.id,
- 'location_id' : picking.location_id.id,
- 'location_dest_id' : picking.location_dest_id.id,
+ def _partial_move_for(self, cr, uid, move):
+ partial_move = {
+ 'product_id' : move.product_id.id,
+ 'quantity' : move.product_qty,
+ 'product_uom' : move.product_uom.id,
+ 'prodlot_id' : move.prodlot_id.id,
+ 'move_id' : move.id,
+ 'location_id' : move.location_id.id,
+ 'location_dest_id' : move.location_dest_id.id,
}
-
- if pick_type == 'in':
- move_memory.update({
- 'cost' : picking.product_id.standard_price,
- 'currency' : picking.product_id.company_id and picking.product_id.company_id.currency_id and picking.product_id.company_id.currency_id.id or False,
- })
- return move_memory
+ if move.picking_id.type == 'in' and move.product_id.cost_method == 'average':
+ partial_move.update(update_cost=True, **self._product_cost_for_average_update(cr, uid, move))
+ return partial_move
def do_partial(self, cr, uid, ids, context=None):
- """ Makes partial moves and pickings done.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- pick_obj = self.pool.get('stock.picking')
- stock_move_obj = self.pool.get('stock.move')
- picking_ids = context.get('active_ids', False)
+ assert len(ids) == 1, 'Partial picking processing may only be done one at a time'
+ stock_picking = self.pool.get('stock.picking')
+ stock_move = self.pool.get('stock.move')
partial = self.browse(cr, uid, ids[0], context=context)
- partial_datas = {
+ partial_data = {
'delivery_date' : partial.date
}
- for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
- picking_type = self.get_picking_type(cr, uid, pick, context=context)
- moves_list = picking_type == 'in' and partial.product_moves_in or partial.product_moves_out
- for move in moves_list:
- if not move.move_id.id:
- seq_obj_name = 'stock.picking.' + picking_type
- move_id = stock_move_obj.create(cr,uid,{'name' : self.pool.get('ir.sequence').get(cr, uid, seq_obj_name),
- 'product_id': move.product_id.id,
- 'product_qty': move.quantity,
- 'product_uom': move.product_uom.id,
- 'prodlot_id': move.prodlot_id.id,
- 'location_id' : move.location_id.id,
- 'location_dest_id' : move.location_dest_id.id,
- 'picking_id': pick.id
- },context=context)
- stock_move_obj.action_done(cr, uid, [move_id], context)
- else:
- move_id = move.move_id.id
-
- partial_datas['move%s' % (move_id)] = {
- 'product_id': move.product_id.id,
- 'product_qty': move.quantity,
- 'product_uom': move.product_uom.id,
- 'prodlot_id': move.prodlot_id.id,
- }
- if (picking_type == 'in') and (move.product_id.cost_method == 'average'):
- partial_datas['move%s' % (move.move_id.id)].update({
- 'product_price' : move.cost,
- 'product_currency': move.currency.id,
- })
- pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
+ picking_type = partial.picking_id.type
+ for move in partial.move_ids:
+ move_id = move.move_id.id
+ if not move_id:
+ seq_obj_name = 'stock.picking.' + picking_type
+ move_id = stock_move.create(cr,uid,{'name' : self.pool.get('ir.sequence').get(cr, uid, seq_obj_name),
+ 'product_id': move.product_id.id,
+ 'product_qty': move.quantity,
+ 'product_uom': move.product_uom.id,
+ 'prodlot_id': move.prodlot_id.id,
+ 'location_id' : move.location_id.id,
+ 'location_dest_id' : move.location_dest_id.id,
+ 'picking_id': partial.picking_id.id
+ },context=context)
+ stock_move.action_done(cr, uid, [move_id], context)
+ partial_data['move%s' % (move_id)] = {
+ 'product_id': move.product_id.id,
+ 'product_qty': move.quantity,
+ 'product_uom': move.product_uom.id,
+ 'prodlot_id': move.prodlot_id.id,
+ }
+ if (picking_type == 'in') and (move.product_id.cost_method == 'average'):
+ partial_data['move%s' % (move.move_id.id)].update(product_price=move.cost,
+ product_currency=move.currency.id)
+ stock_picking.do_partial(cr, uid, [partial.picking_id.id], partial_data, context=context)
return {'type': 'ir.actions.act_window_close'}
-stock_partial_picking()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 4887c1e16d8..be85d266673 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -9,5 +9,59 @@
new
+
+ stock.partial.picking.form
+ stock.partial.picking
+ form
+
+
+
+
+
+
+ stock.partial.picking.line.list
+ stock.partial.picking.line
+ tree
+
+
+
+
+
+
+ stock.partial.picking.line.form
+ stock.partial.picking.line
+ form
+
+
+
+
diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
index 806792868d4..795da509d04 100644
--- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml
+++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml
@@ -38,36 +38,19 @@
"active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"),
})
-
- I create a record for partial picking.
--
- !record {model: stock.partial.picking, id: stock_partial_picking_0}:
- date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
--
- I make picking order Done.
+ I process the delivery
-
!python {model: stock.partial.picking}: |
- pick_obj = self.pool.get('stock.picking')
- partial = self.browse(cr, uid, ref('stock_partial_picking_0'), context)
- partial_datas = {
- 'delivery_date' : partial.date
- }
- for pick in pick_obj.browse(cr, uid, [ref('stock_picking_out0')]):
- for m in pick.move_lines:
- partial_datas['move%s'%(m.id)] = {
- 'product_id' : m.product_id.id,
- 'product_qty' : m.product_qty,
- 'product_uom' : m.product_uom.id
- }
- self.do_partial(cr, uid, [ref('stock_partial_picking_0')], {"lang": "en_US", "search_default_available":
- 1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner",
- "active_ids": [ref('stock_picking_out0')], "active_id": ref("stock_picking_out0"),
- })
+ partial_id = self.create(cr, uid, {}, context={'active_model':'stock.picking',
+ 'active_ids':[ref('stock_picking_out0')]})
+ self.do_partial(cr, uid, [partial_id])
+
-
As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order.
-
!python {model: stock.invoice.onshipping}: |
- wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.bank_journal')},
- {'active_ids': [ref("stock_picking_out0")]})
+ wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.sales_journal')},
+ {'active_ids': [ref("stock_picking_out0")], "active_model": "stock.picking"})
self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US",
"search_default_available": 1, "tz": False, "active_model": "stock.picking",
"contact_display": "partner", "active_ids": [ref("stock_picking_out0")], "active_id": ref("stock_picking_out0")})
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 11b31725a88..3725d9b6d7f 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -25,24 +25,15 @@ class invoice_directly(osv.osv_memory):
_inherit = 'stock.partial.picking'
def do_partial(self, cr, uid, ids, context=None):
- """ Makes partial moves and pickings done and
- launches Create invoice wizard if invoice state is To be Invoiced.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param context: A standard dictionary
- @return:
+ """Launch Create invoice wizard if invoice state is To be Invoiced,
+ after processing the partial picking.
"""
- if context is None:
- context = {}
+ if context is None: context = {}
result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
- pick_obj = self.pool.get('stock.picking')
- context.update({'active_model':'stock.picking'})
- picking_ids = context.get('active_ids', False)
- if picking_ids:
- context.update({'active_id':picking_ids[0]})
- pick = pick_obj.browse(cr, uid, picking_ids, context=context)[0]
- if pick.invoice_state == '2binvoiced':
+ partial = self.browse(cr, uid, ids[0], context)
+ context.update(active_model='stock.picking',
+ active_ids=[partial.picking_id.id])
+ if partial.picking_id.invoice_state == '2binvoiced':
return {
'name': 'Create Invoice',
'view_type': 'form',
@@ -55,5 +46,5 @@ class invoice_directly(osv.osv_memory):
return {'type': 'ir.actions.act_window_close'}
invoice_directly()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index fe0b2f8f3ce..3ec992ecd0c 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -46,7 +46,7 @@ class stock_period(osv.osv):
'name': fields.char('Period Name', size=64, required=True),
'date_start': fields.datetime('Start Date', required=True),
'date_stop': fields.datetime('End Date', required=True),
- 'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State')
+ 'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'State'),
}
_defaults = {
'state': 'draft'
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods.py b/addons/stock_planning/wizard/stock_planning_create_periods.py
index 05f8aa925a9..963ff416822 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods.py
+++ b/addons/stock_planning/wizard/stock_planning_create_periods.py
@@ -46,6 +46,7 @@ class stock_period_createlines(osv.osv_memory):
'date_start': fields.date('Start Date', required=True, help="Starting date for planning period."),
'date_stop': fields.date('End Date', required=True, help="Ending date for planning period."),
'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
+ 'period_ids': fields.many2many('stock.period', 'stock_period_createlines_stock_period_rel', 'wizard_id', 'period_id', 'Periods'),
}
_defaults={
'date_start': _get_new_period_start,
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index a351a3da9b4..89571bd647a 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -1281,6 +1281,7 @@
20
open
5
diff --git a/addons/survey/test/survey00.yml b/addons/survey/test/survey00.yml
index 7bfe8a5320d..fa56e9fac39 100644
--- a/addons/survey/test/survey00.yml
+++ b/addons/survey/test/survey00.yml
@@ -144,8 +144,8 @@
Give answer of the survey, Run "Answer a Survey" wizard and select the survey and press on start button then run the selected survey.
-
!python {model: survey.name.wiz}: |
- ids = self.create(cr, uid, {'survey_id': ref("survey_partner_0")})
- self.action_next(cr, uid, [ids], context)
+ id = self.create(cr, uid, {'survey_id': ref("survey_partner_0")})
+ self.action_next(cr, uid, [id], context)
-
Give answer of the first and second page in "Partner Feedback" suvey.
-
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 471290af2cb..be43a409774 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -40,14 +40,6 @@ class survey_question_wiz(osv.osv_memory):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
"""
Fields View Get method :- generate the new view and display the survey pages of selected survey.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param view_id : view id of the current object.
- @param view_type : which type of view is create. like :- form, tree ,search etc...
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for created view of particular survey pages.
"""
result = super(survey_question_wiz, self).fields_view_get(cr, uid, view_id, \
@@ -88,7 +80,7 @@ class survey_question_wiz(osv.osv_memory):
if not survey_id:
# Try one more time to find it
if sur_name_rec and sur_name_rec.survey_id:
- survey_id = sur_name_rec.survey_id[0]
+ survey_id = sur_name_rec.survey_id.id
else:
# raise osv.except_osv(_('Error!'), _("Cannot locate survey for the question wizard!"))
# If this function is called without a survey_id in
@@ -398,10 +390,10 @@ class survey_question_wiz(osv.osv_memory):
sur_response_obj.write(cr, uid, [sur_name_read.response], {'state' : 'done'})
if sur_rec.send_response:
- survey_data = survey_obj.browse(cr, uid, int(survey_id))
+ survey_data = survey_obj.browse(cr, uid, survey_id)
response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
context.update({'response_id':response_id})
- report = self.create_report(cr, uid, [int(survey_id)], 'report.survey.browse.response', survey_data.title,context)
+ report = self.create_report(cr, uid, [survey_id], 'report.survey.browse.response', survey_data.title,context)
attachments = {}
file = open(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
file_data = ""
@@ -445,15 +437,6 @@ class survey_question_wiz(osv.osv_memory):
def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
"""
If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Answer' set True in survey then send mail on responsible person of this survey and attach survey answer report in pdf format.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param res_ids: List of survey answer IDs,
- @param report_name: name of the report,
- @param file_name: To give file name of the report,
- @param context: A standard dictionary for contextual values,
- @return : Dictionary value for created report with file nameself.
"""
if not report_name or not res_ids:
return (False, Exception('Report name and Resources ids are required !!!'))
@@ -474,13 +457,6 @@ class survey_question_wiz(osv.osv_memory):
def default_get(self, cr, uid, fields_list, context=None):
"""
Assign Default value in particular field. If Browse Answers wizard run then read the value into database and Assigne to a particular fields.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields_list: List of fields of current view,
- @param context: A standard dictionary for contextual values,
- @return : Dictionary value for fields list with value.
"""
value = {}
if context is None:
@@ -556,13 +532,6 @@ class survey_question_wiz(osv.osv_memory):
def create(self, cr, uid, vals, context=None):
"""
Create the Answer of survey and store in survey.response object, and if set validation of question then check the value of question if value is wrong then raise the exception.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param vals: Values,
- @param context: A standard dictionary for contextual values
- @return : True.
"""
if context is None: context = {}
if context.has_key('active') and context.get('active',False):
@@ -600,9 +569,10 @@ class survey_question_wiz(osv.osv_memory):
#click first time on next button then increemnet on total start suvey
if not sur_name_read['store_ans']:
his_id = self.pool.get('survey.history').create(cr, uid, {'user_id': uid, \
- 'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id']})
- sur_rec = survey_obj.read(cr, uid, sur_name_read['survey_id'])
- survey_obj.write(cr, uid, sur_name_read['survey_id'], {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
+ 'date': strftime('%Y-%m-%d %H:%M:%S'), 'survey_id': sur_name_read['survey_id'][0]})
+ survey_id = sur_name_read['survey_id'][0]
+ sur_rec = survey_obj.read(cr, uid, survey_id)
+ survey_obj.write(cr, uid, survey_id, {'tot_start_survey' : sur_rec['tot_start_survey'] + 1})
if context.has_key('cur_id'):
if context.has_key('request') and context.get('request',False):
self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
@@ -1016,13 +986,6 @@ class survey_question_wiz(osv.osv_memory):
def action_new_question(self,cr, uid, ids, context=None):
"""
New survey.Question form.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open new survey.Qestion form.
"""
if context is None:
context = {}
@@ -1044,13 +1007,6 @@ class survey_question_wiz(osv.osv_memory):
def action_new_page(self, cr, uid, ids, context=None):
"""
New survey.Page form.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open new survey.page form.
"""
if context is None:
context = {}
@@ -1072,13 +1028,6 @@ class survey_question_wiz(osv.osv_memory):
def action_edit_page(self,cr, uid, ids, context=None):
"""
Edit survey.page.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open Edit survey.page form.
"""
if context is None:
context = {}
@@ -1101,13 +1050,6 @@ class survey_question_wiz(osv.osv_memory):
def action_delete_page(self,cr, uid, ids, context=None):
"""
Delete survey.page.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open next survey.page form, but delete the selected page.
"""
if context is None:
context = {}
@@ -1134,13 +1076,6 @@ class survey_question_wiz(osv.osv_memory):
def action_edit_question(self,cr, uid, ids, context=None):
"""
Edit survey.question.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open Edit survey.question form.
"""
if context is None:
context = {}
@@ -1163,13 +1098,6 @@ class survey_question_wiz(osv.osv_memory):
def action_delete_question(self,cr, uid, ids, context=None):
"""
Delete survey.question.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open same survey.page form, but delete the selected survey.question in current survey.page.
"""
if context is None:
context = {}
@@ -1197,13 +1125,6 @@ class survey_question_wiz(osv.osv_memory):
def action_forward_previous(self, cr, uid, ids, context=None):
"""
Goes to previous Survey Answer.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open Previous Answer form.
"""
if context is None:
context = {}
@@ -1229,13 +1150,6 @@ class survey_question_wiz(osv.osv_memory):
def action_forward_next(self, cr, uid, ids, context=None):
"""
Goes to Next Survey Answer.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open Next Answer form.
"""
if context is None:
context = {}
@@ -1261,13 +1175,6 @@ class survey_question_wiz(osv.osv_memory):
def action_next(self, cr, uid, ids, context=None):
"""
Goes to Next page.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open Next survey.page form.
"""
if context is None:
context = {}
@@ -1288,13 +1195,6 @@ class survey_question_wiz(osv.osv_memory):
def action_previous(self, cr, uid, ids, context=None):
"""
Goes to previous page.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.question.wiz IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for Open Previous survey.page form.
"""
if context is None:
context = {}
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index 1798a7c418c..5af913993b2 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -24,26 +24,9 @@ from osv import fields
class survey_browse_answer(osv.osv_memory):
_name = 'survey.browse.answer'
-
- def _get_survey(self, cr, uid, context=None):
- """
- Set the value in survey_id field,
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param context: A standard dictionary for contextual values,
- @return : Tuple in list with values.
- """
- surv_obj = self.pool.get("survey")
- surv_resp_obj = self.pool.get("survey.response")
- result = []
- for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
- if surv_resp_obj.search(cr, uid, [('survey_id', '=', sur.id)]):
- result.append((sur.id, sur.title))
- return result
_columns = {
- 'survey_id': fields.selection(_get_survey, "Survey", required="1"),
+ 'survey_id': fields.many2one('survey', "Survey", required="1"),
'response_id': fields.many2one("survey.response", "Survey Answers", help="If this field is empty, all answers of the selected survey will be print."),
}
@@ -51,13 +34,6 @@ class survey_browse_answer(osv.osv_memory):
"""
Open Browse Response wizard. if you select only survey_id then this wizard open with all response_ids and
if you select survey_id and response_id then open the particular response of the survey.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of survey.browse.answer IDs,
- @param context: A standard dictionary for contextual values,
- @return : Dictionary value for Open the browse answer wizard.
"""
if context is None: context = {}
record = self.read(cr, uid, ids, [])
@@ -66,8 +42,8 @@ class survey_browse_answer(osv.osv_memory):
res_id = [(record.get('response_id') and record['response_id'][0])]
else:
sur_response_obj = self.pool.get('survey.response')
- res_id = sur_response_obj.search(cr, uid, [('survey_id', '=',int(record['survey_id']))])
- context.update({'active' : True,'survey_id' : record['survey_id'], 'response_id' : res_id, 'response_no' : 0})
+ res_id = sur_response_obj.search(cr, uid, [('survey_id', '=', record['survey_id'][0])])
+ context.update({'active' : True,'survey_id' : record['survey_id'][0], 'response_id' : res_id, 'response_no' : 0})
search_obj = self.pool.get('ir.ui.view')
search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
return {
diff --git a/addons/survey/wizard/survey_print.py b/addons/survey/wizard/survey_print.py
index 87767f34a68..6ae84ed37cc 100644
--- a/addons/survey/wizard/survey_print.py
+++ b/addons/survey/wizard/survey_print.py
@@ -27,8 +27,7 @@ from tools.translate import _
class survey_print(osv.osv_memory):
_name = 'survey.print'
_columns = {
- 'survey_ids': fields.many2many('survey','survey_print',\
- 'survey_id','print_id', "Survey", required="1"),
+ 'survey_ids': fields.many2many('survey', string="Survey", required="1"),
'orientation' : fields.selection([('vertical','Portrait(Vertical)'),\
('horizontal','Landscape(Horizontal)')], 'Orientation'),
'paper_size' : fields.selection([('letter','Letter (8.5" x 11")'),\
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 10b321fcf45..bd8b9f2ad14 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -26,20 +26,12 @@ from tools.translate import _
class survey_print_statistics(osv.osv_memory):
_name = 'survey.print.statistics'
_columns = {
- 'survey_ids': fields.many2many('survey','survey_print_statistics','survey_id',\
- 'print_id', "Survey", required="1"),
+ 'survey_ids': fields.many2many('survey', string="Survey", required="1"),
}
def action_next(self, cr, uid, ids, context=None):
"""
Print Survey Statistics in pdf format.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Survey statistics IDs
- @param context: A standard dictionary for contextual values
- @return: Dictionary value for created survey statistics report
"""
if context is None:
context = {}
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index c6eebd62a67..a803459899c 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -26,71 +26,8 @@ from tools.translate import _
class survey_name_wiz(osv.osv_memory):
_name = 'survey.name.wiz'
- def default_get(self, cr, uid, fields, context=None):
- """
- Set the default value in survey_id field. if open this wizard in survey form then set the default value in survey_id = active survey id.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param fields: List of Survey statistics IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for created survey statistics report
- """
- if context is None:
- context = {}
- data = super(survey_name_wiz, self).default_get(cr, uid, fields, context)
- if context.has_key('survey_id'):
- data['survey_id'] = context.get('survey_id',False)
- return data
-
- def _get_survey(self, cr, uid, context=None):
- """
- Set the value In survey_id field.
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Survey statistics IDs
- @param context: A standard dictionary for contextual values
- @return: Dictionary value for created survey statistics report
- """
- surv_obj = self.pool.get("survey")
- result = []
- if context.has_key('survey_id'):
- for sur in surv_obj.browse(cr, uid, [context.get('survey_id',False)]):
- result.append((sur.id, sur.title))
- return result
- survey_user_group_id = self.pool.get('res.groups').search(cr, uid, [('name', '=', 'Survey / User')])
- group_id = self.pool.get('res.groups').search(cr, uid, [('name', 'in', ('Tools / Manager','Tools / User','Survey / User'))])
- user_obj = self.pool.get('res.users')
- user_rec = user_obj.read(cr, uid, uid, [])
- if survey_user_group_id:
- if survey_user_group_id == user_rec['groups_id']:
- for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
- if sur.state == 'open':
- u_list = []
- for use in sur.invited_user_ids:
- u_list.append(use.id)
- if uid in u_list:
- result.append((sur.id, sur.title))
- return result
- for sur in surv_obj.browse(cr, uid, surv_obj.search(cr, uid, [])):
- if sur.state == 'open':
- res = False
- for i in group_id:
- if i in user_rec['groups_id']:
- res = True
- break
- elif sur.id in user_rec['survey_id']:
- res = True
- break
- if res:
- result.append((sur.id, sur.title))
- return result
-
_columns = {
- 'survey_id': fields.selection(_get_survey, "Survey", required="1"),
+ 'survey_id': fields.many2one('survey', 'Survey', required=True, ondelete='cascade'),
'page_no': fields.integer('Page Number'),
'note': fields.text("Description"),
'page': fields.char('Page Position',size = 12),
@@ -99,10 +36,11 @@ class survey_name_wiz(osv.osv_memory):
'response': fields.char('Answer',size=16)
}
_defaults = {
- 'page_no': lambda * a: - 1,
- 'page': lambda * a: 'next',
- 'transfer': lambda * a: 1,
- 'response': lambda * a: 0,
+ 'page_no': -1,
+ 'page': 'next',
+ 'transfer': 1,
+ 'response': 0,
+ 'survey_id': lambda self,cr,uid,context:context.get('survey_id',False),
}
def action_next(self, cr, uid, ids, context=None):
@@ -110,30 +48,22 @@ class survey_name_wiz(osv.osv_memory):
Start the survey, Increment in started survey field but if set the max_response_limit of
survey then check the current user how many times start this survey. if current user max_response_limit
is reach then this user can not start this survey(Raise Exception).
-
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Survey IDs
- @param context: A standard dictionary for contextual values
- @return : Dictionary value for open survey question wizard.
"""
survey_obj = self.pool.get('survey')
search_obj = self.pool.get('ir.ui.view')
if context is None: context = {}
this = self.browse(cr, uid, ids, context=context)[0]
- survey_id = this.survey_id
+ survey_id = this.survey_id.id
context.update({'survey_id': survey_id, 'sur_name_id': this.id})
cr.execute('select count(id) from survey_history where user_id=%s\
and survey_id=%s' % (uid,survey_id))
res = cr.fetchone()[0]
- user_limit = survey_obj.read(cr, uid, survey_id, ['response_user'])['response_user']
- if user_limit and res >= user_limit:
+ sur_rec = survey_obj.browse(cr,uid,survey_id,context=context)
+ if sur_rec.response_user and res >= sur_rec.response_user:
raise osv.except_osv(_('Warning !'),_("You can not give response for this survey more than %s times") % (user_limit))
- sur_rec = survey_obj.browse(cr,uid,ids,context=context)[0]
if sur_rec.max_response_limit and sur_rec.max_response_limit <= sur_rec.tot_start_survey:
raise osv.except_osv(_('Warning !'),_("You can not give more response. Please contact the author of this survey for further assistance."))
@@ -152,16 +82,10 @@ class survey_name_wiz(osv.osv_memory):
def on_change_survey(self, cr, uid, ids, survey_id, context=None):
"""
on change event of survey_id field, if note is available in selected survey then display this note in note fields.
- @param ids: List of Survey IDs
- @param survey_id: Id of Survey
- @param context: A standard dictionary for contextual values
- @return : Dictionary values of notes fields.
"""
if not survey_id:
return {}
notes = self.pool.get('survey').read(cr, uid, survey_id, ['note'])['note']
return {'value': {'note': notes}}
-survey_name_wiz()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index a72566f7888..144525979dd 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -15,7 +15,8 @@
).
+Copyright © 2010-2011 OpenERP SA ().
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py
index cea342ef05e..85187aa492c 100644
--- a/addons/web_livechat/__openerp__.py
+++ b/addons/web_livechat/__openerp__.py
@@ -2,7 +2,7 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2010 OpenERP s.a. ().
+# Copyright (C) 2010-2011 OpenERP s.a. ().
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
@@ -20,7 +20,7 @@
##############################################################################
{
'name': 'Live Chat Support',
- 'version': '1.1',
+ 'version': '2.0',
'category': 'Tools',
'complexity': "easy",
'description': """
@@ -33,9 +33,14 @@ Add "Support" button in header from where you can access OpenERP Support.
'website': 'http://openerp.com',
'depends': ['base'],
'update_xml': [],
+ 'js' : [
+ 'static/src/js/web_livechat.js',
+ ],
+ 'css' : [
+ 'static/src/css/lc.css',
+ ],
'installable': True,
- 'active': True,
- 'web': True,
+ 'active': False,
'certificate': '0013762192410413',
- 'images': ['images/web_livechat_support.jpeg'],
+ 'images': ['static/src/img/web_livechat_support.jpeg'],
}
diff --git a/addons/web_livechat/publisher_warranty.py b/addons/web_livechat/publisher_warranty.py
index ab83bc58c32..132e78d013e 100644
--- a/addons/web_livechat/publisher_warranty.py
+++ b/addons/web_livechat/publisher_warranty.py
@@ -44,7 +44,7 @@ class publisher_warranty_contract(osv.osv):
@cache(skiparg=3)
def get_default_livechat_text(self, cr, uid):
- return '
Support'
+ return '
Support'
publisher_warranty_contract()
diff --git a/addons/web_livechat/web/static/css/lc.css b/addons/web_livechat/static/src/css/lc.css
similarity index 74%
rename from addons/web_livechat/web/static/css/lc.css
rename to addons/web_livechat/static/src/css/lc.css
index e6892857ddd..7f1876a2793 100644
--- a/addons/web_livechat/web/static/css/lc.css
+++ b/addons/web_livechat/static/src/css/lc.css
@@ -1,7 +1,7 @@
-#livechat_status a.online {
+.livechat span.online {
text-shadow: 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404;
}
-#livechat_status img {
+.livechat img {
vertical-align: middle;
margin-right: 0.5em;
}
diff --git a/addons/web_livechat/static/src/img/available.png b/addons/web_livechat/static/src/img/available.png
new file mode 100644
index 00000000000..e9eea88ae5f
Binary files /dev/null and b/addons/web_livechat/static/src/img/available.png differ
diff --git a/addons/web_livechat/static/src/img/away.png b/addons/web_livechat/static/src/img/away.png
new file mode 100644
index 00000000000..f0a0847059f
Binary files /dev/null and b/addons/web_livechat/static/src/img/away.png differ
diff --git a/addons/web_livechat/static/src/img/busy.png b/addons/web_livechat/static/src/img/busy.png
new file mode 100644
index 00000000000..ddb24377f0f
Binary files /dev/null and b/addons/web_livechat/static/src/img/busy.png differ
diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js
new file mode 100644
index 00000000000..6fed859449c
--- /dev/null
+++ b/addons/web_livechat/static/src/js/web_livechat.js
@@ -0,0 +1,100 @@
+/*############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2011 OpenERP SA ().
+#
+# This program is free software: you can redistribute it and/or modify
+# 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 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 
Support',
+ offline: '
Support',
+ }
+ });
+ });
+ }
+});
+
+openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient);
+openerp.webclient.livechat.prependTo('div.header_corner');
+
+};
diff --git a/addons/web_livechat/static/src/xml/web_livechat.xml b/addons/web_livechat/static/src/xml/web_livechat.xml
new file mode 100644
index 00000000000..b5e2db515b0
--- /dev/null
+++ b/addons/web_livechat/static/src/xml/web_livechat.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
diff --git a/addons/web_livechat/web/__init__.py b/addons/web_livechat/web/__init__.py
deleted file mode 100644
index ec026b194f1..00000000000
--- a/addons/web_livechat/web/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-##############################################################################
-# This file is part of the "web-livechatinc-odoo" OpenERP module.
-# See LICENCE file at the root of the module folder.
-##############################################################################
-import editors
diff --git a/addons/web_livechat/web/editors.py b/addons/web_livechat/web/editors.py
deleted file mode 100644
index bb3dd3da354..00000000000
--- a/addons/web_livechat/web/editors.py
+++ /dev/null
@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2010-2011 OpenERP s.a. ().
-#
-# This program is free software: you can redistribute it and/or modify
-# 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 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
| Title : | -||
| Progress : | -||
| - | - | |
| Project name: | -||
| Phase | -||
| Remain Time : | -||
| Spent Time : | -||
| Remain Time : | -||
+
+
+
+
+
+
+ |
+ |
+
+ |
+
+
+
+
+
+ |
+
+ |
+
+
+
+ |
+
Support'
+ return 'Support'
publisher_warranty_contract()
diff --git a/addons/web_livechat/web/static/css/lc.css b/addons/web_livechat/static/src/css/lc.css
similarity index 74%
rename from addons/web_livechat/web/static/css/lc.css
rename to addons/web_livechat/static/src/css/lc.css
index e6892857ddd..7f1876a2793 100644
--- a/addons/web_livechat/web/static/css/lc.css
+++ b/addons/web_livechat/static/src/css/lc.css
@@ -1,7 +1,7 @@
-#livechat_status a.online {
+.livechat span.online {
text-shadow: 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404, 0 0 0.2em #9a0404;
}
-#livechat_status img {
+.livechat img {
vertical-align: middle;
margin-right: 0.5em;
}
diff --git a/addons/web_livechat/static/src/img/available.png b/addons/web_livechat/static/src/img/available.png
new file mode 100644
index 00000000000..e9eea88ae5f
Binary files /dev/null and b/addons/web_livechat/static/src/img/available.png differ
diff --git a/addons/web_livechat/static/src/img/away.png b/addons/web_livechat/static/src/img/away.png
new file mode 100644
index 00000000000..f0a0847059f
Binary files /dev/null and b/addons/web_livechat/static/src/img/away.png differ
diff --git a/addons/web_livechat/static/src/img/busy.png b/addons/web_livechat/static/src/img/busy.png
new file mode 100644
index 00000000000..ddb24377f0f
Binary files /dev/null and b/addons/web_livechat/static/src/img/busy.png differ
diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js
new file mode 100644
index 00000000000..6fed859449c
--- /dev/null
+++ b/addons/web_livechat/static/src/js/web_livechat.js
@@ -0,0 +1,100 @@
+/*############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2011 OpenERP SA (Support',
+ offline: 'Support',
+ }
+ });
+ });
+ }
+});
+
+openerp.webclient.livechat = new openerp.web_livechat.Livechat(openerp.webclient);
+openerp.webclient.livechat.prependTo('div.header_corner');
+
+};
diff --git a/addons/web_livechat/static/src/xml/web_livechat.xml b/addons/web_livechat/static/src/xml/web_livechat.xml
new file mode 100644
index 00000000000..b5e2db515b0
--- /dev/null
+++ b/addons/web_livechat/static/src/xml/web_livechat.xml
@@ -0,0 +1,8 @@
+
+
+'
- corner = output.index(PATTERN) + len(PATTERN)
-
-
- output = output[:corner] + """
-
- ${ rpc.RPCProxy('publisher_warranty.contract').get_default_livechat_text() | n} -
- % if cp.session['livechat']: - - - - % endif - """ + output[corner:] - return output - diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py index cc248e90da7..ebcc91e7e67 100644 --- a/addons/web_uservoice/__openerp__.py +++ b/addons/web_uservoice/__openerp__.py @@ -35,7 +35,6 @@ Invite OpenERP user feedback, powered by uservoice. 'data': [], 'installable': True, 'active': False, - 'web': True, 'certificate': '0040452504963885', 'images': ['images/submit_an_idea.jpeg','images/web_uservoice_feedback.jpeg'], }