-
-
-
-
- Minimum Stock Rules
- stock.warehouse.orderpoint
- ir.actions.act_window
- form
-
-
-
-
-
-
-
-
- button_cancel
-
+
-
-
- mrp.procurement.basic
- mrp.procurement
- True
-
-
-
-
- True
- draft
-
-
-
- cancel
- function
- action_cancel()
- True
-
-
-
- confirm
- function
- action_confirm()
-
-
-
- confirm_wait
- function
- write({'state':'exception'})
-
-
-
- confirm_mts
-
-
-
- confirm_mto
-
-
-
- make_to_stock
- function
- action_move_assigned()
-
-
+ producesubflowaction_produce_assign_product()
-
+ produce_check
-
+ produce_servicefunctionaction_produce_assign_service()
-
-
- buy
- subflow
-
- action_po_assign()
-
-
-
- ready
- function
- action_ready()
-
-
-
- wait_done
- function
- write({'state':'waiting'})
-
-
-
-
- True
- done
- function
- action_done()
-
-
-
-
-
- button_confirm
-
-
-
-
- button_wait_done
- True
-
-
-
-
- check_move_done()
- stock.move
- [move_id.id]
-
-
-
-
-
- button_check
- test_cancel()
-
-
-
-
- button_check
- not test_cancel()
-
-
-
-
- procure_method=='make_to_order'
-
-
-
-
- procure_method=='make_to_stock'
-
-
-
-
- button_cancel
-
-
-
-
- button_cancel
-
-
-
-
- button_restart
-
-
-
-
- button_cancel
-
-
-
-
- button_restart
-
-
-
-
- button_cancel
-
-
-
-
- check_make_to_stock()
-
+
-
+ check_produce()
-
-
-
- check_product()
- not check_product()
-
-
-
- check_buy()
-
-
-
-
- True
-
-
-
-
-
-
- subflow.cancel
-
+
-
+ subflow.cancel
-
-
-
- subflow.cancel
-
-
-
-
-
- subflow.done
-
-
+
-
+
-
-
-
- subflow.delivery_done
+
+
+
+
+ check_product()
-
-
-
- action_check_finnished()
+
+
+
+
+ subflow.cancel
-
-
-
- check_move_cancel()
+
+
+
+
+ subflow.done
+
+
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 17d72a520f2..08d66570b1f 100644
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,43 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -46,31 +19,31 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -79,10 +52,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -91,10 +76,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -102,14 +99,14 @@
-
+
-
+
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 48f27679435..d5e00b9cbda 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -1,7 +1,5 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_mrp_workcenter","mrp.workcenter","model_mrp_workcenter","mrp.group_mrp_user",1,0,0,0
-"access_mrp_property_group","mrp.property.group","model_mrp_property_group","mrp.group_mrp_user",1,0,0,0
-"access_mrp_property","mrp.property","model_mrp_property","mrp.group_mrp_user",1,0,0,0
"access_mrp_routing","mrp.routing","model_mrp_routing","mrp.group_mrp_user",1,0,0,0
"access_mrp_routing_workcenter","mrp.routing.workcenter","model_mrp_routing_workcenter","mrp.group_mrp_user",1,0,0,0
"access_mrp_bom","mrp.bom","model_mrp_bom","mrp.group_mrp_user",1,0,0,0
@@ -10,11 +8,7 @@
"access_mrp_production_workcenter_line","mrp.production.workcenter.line","model_mrp_production_workcenter_line","mrp.group_mrp_user",1,1,1,1
"access_mrp_production_product_line","mrp.production.product.line","model_mrp_production_product_line","mrp.group_mrp_user",1,1,1,1
"access_mrp_procurement","mrp.procurement","model_mrp_procurement","mrp.group_mrp_user",1,1,1,1
-"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint","mrp.group_mrp_user",1,0,0,0
-"access_stock_warehouse_orderpoint_manager","stock.warehouse.orderpoint.manager","model_stock_warehouse_orderpoint","mrp.group_mrp_manager",1,1,1,1
"access_mrp_workcenter_manager","mrp.workcenter.manager","model_mrp_workcenter","mrp.group_mrp_user",1,1,1,1
-"access_mrp_property_group_manager","mrp.property.group.manager","model_mrp_property_group","mrp.group_mrp_user",1,1,1,1
-"access_mrp_property_manager","mrp.property.manager","model_mrp_property","mrp.group_mrp_user",1,1,1,1
"access_mrp_routing_manager","mrp.routing.manager","model_mrp_routing","mrp.group_mrp_manager",1,1,1,1
"access_mrp_routing_workcenter_manager","mrp.routing.workcenter.manager","model_mrp_routing_workcenter","mrp.group_mrp_manager",1,1,1,1
"access_mrp_bom_manager","mrp.bom.manager","model_mrp_bom","mrp.group_mrp_manager",1,1,1,1
@@ -32,10 +26,7 @@
"access_mrp_production_stock_worker","mrp.production stock_worker","model_mrp_production","stock.group_stock_user",1,0,0,0
"access_mrp_installer","mrp.installer","model_mrp_installer","mrp.group_mrp_user",1,0,0,0
"access_mrp_product_produce","mrp.product.produce","model_mrp_product_produce","mrp.group_mrp_user",1,0,0,0
-"access_mrp_make_procurement","make.procurement","model_make_procurement","mrp.group_mrp_user",1,0,0,0
"access_mrp_change_production_qty","change.production.qty","model_change_production_qty","mrp.group_mrp_user",1,0,0,0
-"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all","mrp.group_mrp_user",1,0,0,0
-"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute","mrp.group_mrp_user",1,0,0,0
"access_mrp_production_order","mrp.production.order","model_mrp_production_order","mrp.group_mrp_user",1,0,0,0
"access_report_workcenter_load","report.workcenter.load","model_report_workcenter_load","mrp.group_mrp_manager",1,0,0,0
"access_report_mrp_inout","report.mrp.inout","model_report_mrp_inout","mrp.group_mrp_manager",1,0,0,0
diff --git a/addons/mrp/security/mrp_security.xml b/addons/mrp/security/mrp_security.xml
index 955bdad2fdd..4d47e374e02 100644
--- a/addons/mrp/security/mrp_security.xml
+++ b/addons/mrp/security/mrp_security.xml
@@ -16,20 +16,6 @@
-
- mrp_procurement multi-company
-
-
- ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
-
-
-
- stock_warehouse.orderpoint multi-company
-
-
- ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
-
-
mrp_production multi-company
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 4a35d6003cf..dcb7d4573c1 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -27,74 +27,6 @@ import ir
import netsvc
import time
-
-class stock_warehouse_orderpoint(osv.osv):
- """
- Defines Minimum stock rules.
- """
- _name = "stock.warehouse.orderpoint"
- _description = "Orderpoint minimum rule"
-
- _columns = {
- 'name': fields.char('Name', size=32, required=True),
- 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
- 'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
- 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
- 'location_id': fields.many2one('stock.location', 'Location', required=True),
- 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
- 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
- 'product_min_qty': fields.float('Min Quantity', required=True,
- help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a procurement to bring the virtual stock to the Max Quantity."),
- 'product_max_qty': fields.float('Max Quantity', required=True,
- help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
- "a procurement to bring the virtual stock to the Max Quantity."),
- 'qty_multiple': fields.integer('Qty Multiple', required=True,
- help="The procurement quantity will by rounded up to this multiple."),
- 'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
- 'company_id': fields.many2one('res.company','Company',required=True),
- }
- _defaults = {
- 'active': lambda *a: 1,
- 'logic': lambda *a: 'max',
- 'qty_multiple': lambda *a: 1,
- 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
- 'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
- 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
- }
-
- def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
- """ Finds location id for changed warehouse.
- @param warehouse_id: Changed id of warehouse.
- @return: Dictionary of values.
- """
- if warehouse_id:
- w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
- v = {'location_id': w.lot_stock_id.id}
- return {'value': v}
- return {}
-
- def onchange_product_id(self, cr, uid, ids, product_id, context={}):
- """ Finds UoM for changed product.
- @param product_id: Changed id of product.
- @return: Dictionary of values.
- """
- if product_id:
- prod = self.pool.get('product.product').browse(cr,uid,product_id)
- v = {'product_uom': prod.uom_id.id}
- return {'value': v}
- return {}
-
- def copy(self, cr, uid, id, default=None,context={}):
- if not default:
- default = {}
- default.update({
- 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
- })
- return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-
-stock_warehouse_orderpoint()
-
class StockMove(osv.osv):
_inherit = 'stock.move'
diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
new file mode 100644
index 00000000000..df4ade1cb6e
--- /dev/null
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -0,0 +1,234 @@
+-
+ In order to test the mrp phantom bom type in OpenERP, I will create products
+ and then I will create Phantom bom structure for those products.
+-
+ I create the products required to produce some orange juices: Oranges, Sugar and Water.
+-
+ !record {model: product.uom, id: product_uom_litre0}:
+ category_id: product.product_uom_categ_kgm
+ factor: 1.0
+ name: Litre
+ rounding: 0.01
+-
+ !record {model: product.product, id: product_product_orangejuice0}:
+ categ_id: product.cat1
+ name: Orange Juice
+ procure_method: make_to_order
+ supply_method: produce
+ type: product
+ uom_id: product_uom_litre0
+ uom_po_id: product_uom_litre0
+-
+ !record {model: product.product, id: product_product_orange0}:
+ categ_id: product.cat1
+ name: Orange
+ procure_method: make_to_stock
+ seller_ids:
+ - delay: 1
+ name: base.res_partner_asus
+ qty: 1.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_kgm
+ uom_po_id: product.product_uom_kgm
+-
+ !record {model: product.product, id: product_product_sugar0}:
+ categ_id: product.cat1
+ name: Sugar
+ procure_method: make_to_stock
+ seller_ids:
+ - delay: 1
+ name: base.res_partner_desertic_hispafuentes
+ qty: 2.0
+ supply_method: buy
+ type: product
+ uom_id: product.product_uom_kgm
+ uom_po_id: product.product_uom_kgm
+-
+ !record {model: product.product, id: product_product_water0}:
+ categ_id: product.cat1
+ name: Water
+ procure_method: make_to_stock
+ supply_method: buy
+ type: consu
+ uom_id: product_uom_litre0
+ uom_po_id: product_uom_litre0
+-
+ I define the BoM to produce an orange juice
+-
+ !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
+ company_id: base.main_company
+ name: Orange Juice
+ product_efficiency: 1.0
+ product_id: product_product_orangejuice0
+ product_qty: 1.0
+ product_uom: product_uom_litre0
+ type: phantom
+-
+ !record {model: mrp.bom, id: mrp_bom_orangejuice0}:
+ bom_lines:
+ - bom_id: mrp_bom_orangejuice0
+ company_id: base.main_company
+ name: Orange
+ product_efficiency: 1.0
+ product_id: product_product_orange0
+ product_qty: 0.5
+ product_uom: product.product_uom_kgm
+ type: normal
+ - bom_id: mrp_bom_orangejuice0
+ company_id: base.main_company
+ name: Sugar
+ product_efficiency: 1.0
+ product_id: product_product_sugar0
+ product_qty: 0.02
+ product_uom: product.product_uom_kgm
+ type: normal
+ - bom_id: mrp_bom_orangejuice0
+ company_id: base.main_company
+ name: Water
+ product_efficiency: 1.0
+ product_id: product_product_water0
+ product_qty: 0.80000000000000004
+ product_uom: product_uom_litre0
+ type: normal
+-
+ I define Minimum stock rules for my stockable products orange and sugar
+-
+ !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}:
+ company_id: base.main_company
+ location_id: stock.stock_location_stock
+ logic: max
+ name: OP/00002
+ product_id: product_product_orange0
+ product_max_qty: 10.0
+ product_min_qty: 5.0
+ product_uom: product.product_uom_kgm
+ qty_multiple: 1
+ warehouse_id: stock.warehouse0
+-
+ !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}:
+ company_id: base.main_company
+ location_id: stock.stock_location_stock
+ logic: max
+ name: OP/00003
+ product_id: product_product_sugar0
+ product_max_qty: 4.0
+ product_min_qty: 2.0
+ product_uom: product.product_uom_kgm
+ qty_multiple: 1
+ warehouse_id: stock.warehouse0
+-
+ I want to produce 100 litres of Orange juice. I am creating a manufacturing order for this.
+ I want to see how much quantities of sub products I need, to produce the Orange juice.
+-
+ I compute the data. I get the bill of material of Orange juice and list of
+ scheduled products according to my bom.
+-
+ !record {model: mrp.production, id: mrp_production_mo0}:
+ company_id: base.main_company
+ date_planned: '2010-04-16 15:53:36'
+ location_dest_id: stock.stock_location_output
+ location_src_id: stock.stock_location_stock
+ name: MO/00002
+ product_id: product_product_orangejuice0
+ product_qty: 100.0
+ product_uom: product_uom_litre0
+-
+ Creating an mrp.production record. Computing Bills of materials.
+-
+ !record {model: mrp.production, id: mrp_production_mo0}:
+ bom_id: mrp.mrp_bom_orangejuice0
+ company_id: base.main_company
+ date_planned: '2010-04-16 15:53:36'
+ location_dest_id: stock.stock_location_output
+ location_src_id: stock.stock_location_stock
+ name: MO/00002
+ product_id: mrp.product_product_orangejuice0
+ product_lines:
+ - name: Orange
+ product_id: mrp.product_product_orange0
+ product_qty: 50.0
+ product_uom: product.product_uom_kgm
+ production_id: mrp_production_mo0
+ - name: Sugar
+ product_id: mrp.product_product_sugar0
+ product_qty: 2.0
+ product_uom: product.product_uom_kgm
+ production_id: mrp_production_mo0
+ - name: Water
+ product_id: mrp.product_product_water0
+ product_qty: 80.0
+ product_uom: mrp.product_uom_litre0
+ production_id: mrp_production_mo0
+ product_qty: 100.0
+ product_uom: mrp.product_uom_litre0
+-
+ I confirm the order.
+-
+ !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+-
+ I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water.
+-
+ !python {model: mrp.procurement}: |
+ from tools.translate import _
+ proc_ids = self.search(cr, uid, [('origin','=',':MO/00002')])
+ assert proc_ids, _('No Procurements!')
+-
+ The scheduler runs.
+-
+ !function {model: mrp.procurement, name: run_scheduler}:
+ - model: mrp.procurement
+ search: "[('origin','=',':MO/00002')]"
+-
+ I am checking Internal picking. I see one picking for Orange juice and its
+ stock moves for Oranges, Sugar and Water made correctly.
+-
+ !python {model: stock.picking}: |
+ from tools.translate import _
+ pick_ids = self.search(cr, uid, [('origin','=',':MO/00002'),('type','=','internal')])
+ assert pick_ids, _('No Internal Pickings!')
+-
+ According to minimum stock rules. I have 2 purchase orders for
+ Sugar with 6 Kg from Axelor and Orange 60 Kg from ASUStek.
+-
+ I confirm the purchase order of Sugar and Orange.
+-
+ !python {model: purchase.order}: |
+ from tools.translate import _
+ import netsvc
+ purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003'])])
+ assert purch_ids, _('No Purchase Orders were made!')
+ wf_service = netsvc.LocalService("workflow")
+ for p_id in purch_ids:
+ wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+-
+ I get the approval from both the suppliers. So I approve my purchase orders.
+-
+ !python {model: purchase.order}: |
+ from tools.translate import _
+ import netsvc
+ purch_ids = self.search(cr, uid, [('origin','in',['SCHEDULER','OP/00002','OP/00003']),('state','=','confirmed')])
+ assert purch_ids, _('No Confirmed Purchase Orders found!')
+ wf_service = netsvc.LocalService("workflow")
+ for p_id in purch_ids:
+ wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_approve', cr)
+-
+ I see two incoming pickings for Orange and Sugar.
+-
+ !python {model: stock.picking}: |
+ from tools.translate import _
+ pick_ids = self.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+ assert pick_ids, _('No Incoming Shipments found!')
+-
+ I receive both the products. My incoming pickings are done.
+-
+ !record {model: stock.partial.picking, id: stock_partial_picking0}:
+ date: '2010-04-30 16:53:36'
+ partner_id: base.res_partner_asus
+ address_id: base.res_partner_address_tang
+-
+ !python {model: stock.partial.picking}: |
+ pick_obj = self.pool.get('stock.picking')
+ picking_ids = pick_obj.search(cr, uid, [('origin','in',['PO00001:SCHEDULER','PO00002:SCHEDULER','PO00003:OP/00002','PO00004:OP/00003']),('type','=','in')])
+ self.do_partial(cr, uid, [1],context={'active_ids': picking_ids})
+
\ No newline at end of file
diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml
new file mode 100644
index 00000000000..023a9f22f31
--- /dev/null
+++ b/addons/mrp/test/mrp_production_order.yml
@@ -0,0 +1,139 @@
+-
+ In order to test the manufacturing order working with procurements I will use
+ some products with different supply method and procurement method, also check
+ the bills of material for the products.
+-
+ I am creating one manufacturing order.
+-
+ !record {model: mrp.production, id: mrp_production_mo0}:
+ bom_id: mrp.mrp_bom_9
+ routing_id: mrp.mrp_routing_0
+ company_id: base.main_company
+ date_planned: '2010-05-06 14:55:52'
+ location_dest_id: stock.stock_location_stock
+ location_src_id: stock.stock_location_stock
+ name: MO/00004
+ product_id: product.product_product_pc1
+ product_qty: 5.0
+ product_uom: product.product_uom_unit
+ product_uos_qty: 0.0
+-
+ Creating a mrp.production.workcenter.line record
+-
+ !record {model: mrp.production.workcenter.line, id: mrp_production_workcenter_line_assemblyline0}:
+ cycle: 5.0
+ hour: 10.0
+ name: Assembly Line 1
+ production_id: mrp_production_mo0
+ sequence: 0.0
+ workcenter_id: mrp.mrp_workcenter_0
+-
+ Creating a mrp.production.product.line record
+-
+ !record {model: mrp.production.product.line, id: mrp_production_product_line_regularprocessorconfig0}:
+ name: Regular processor config
+ product_id: product.product_product_cpu_gen
+ product_qty: 5.0
+ product_uom: product.product_uom_unit
+ product_uos_qty: 0.0
+ production_id: mrp_production_mo0
+-
+ Creating a mrp.production.product.line record
+-
+ !record {model: mrp.production.product.line, id: mrp_production_product_line_hddseagategb0}:
+ name: HDD Seagate 7200.8 80GB
+ product_id: product.product_product_hdd1
+ product_qty: 5.0
+ product_uom: product.product_uom_unit
+ product_uos_qty: 0.0
+ production_id: mrp_production_mo0
+-
+ Creating a mrp.production.product.line record
+-
+ !record {model: mrp.production.product.line, id: mrp_production_product_line_atxmidsizetower0}:
+ name: ATX Mid-size Tower
+ product_id: product.product_product_tow1
+ product_qty: 5.0
+ product_uom: product.product_uom_unit
+ product_uos_qty: 0.0
+ production_id: mrp_production_mo0
+-
+ Creating a mrp.production.product.line record
+-
+ !record {model: mrp.production.product.line, id: mrp_production_product_line_mouse0}:
+ name: Mouse
+ product_id: product.product_product_25
+ product_qty: 5.0
+ product_uom: product.product_uom_unit
+ product_uos_qty: 0.0
+ production_id: mrp_production_mo0
+-
+ Creating a mrp.production.product.line record
+-
+ !record {model: mrp.production.product.line, id: mrp_production_product_line_keyboard0}:
+ name: Keyboard
+ product_id: product.product_product_24
+ product_qty: 5.0
+ product_uom: product.product_uom_unit
+ product_uos_qty: 0.0
+ production_id: mrp_production_mo0
+-
+ I confirm the order.
+-
+ !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+-
+ I am checking Procurement orders.
+-
+ !python {model: mrp.procurement}: |
+ from tools.translate import _
+ proc_ids = self.search(cr, uid, [('origin','=',':MO/00004')])
+ assert proc_ids, _('No Procurements!')
+-
+ The scheduler runs.
+-
+ !function {model: mrp.procurement, name: run_scheduler}:
+ - model: mrp.procurement
+ search: "[('origin','=',':MO/00004')]"
+-
+ I am checking Internal picking.
+-
+ !python {model: stock.picking}: |
+ from tools.translate import _
+ pick_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('type','=','internal')])
+ assert pick_ids, _('No Internal Pickings!')
+-
+ I see that there is a manufacturing order for the subproduct of PC1 with ready state.
+-
+ !python {model: mrp.production}: |
+ from tools.translate import _
+ order_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','ready')])
+ assert order_ids, _('No manufacturing order!')
+-
+ I start producing that product first. So I marked it as started.
+-
+ !record {model: mrp.product.produce, id: mrp_product_produce0}:
+ product_qty: 5.00
+ mode: 'consume_produce'
+-
+ !python {model: mrp.product.produce}: |
+ prod_obj = self.pool.get('mrp.production')
+ prod_ids = prod_obj.search(cr, uid, [('origin','=',':MO/00004')])
+ self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
+-
+ Now the manufacturing order for subproduct CPU_GEN is done. And manufacturing
+ order for PC1 is in ready state.
+-
+ !python {model: mrp.production}: |
+ from tools.translate import _
+ prod_ids = self.search(cr, uid, [('origin','=',':MO/00004'),('state','=','done')])
+ assert prod_ids, _('Manufacturing order is yet not done!')
+-
+ I start producing the product PC1.
+-
+ !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0}
+-
+ !python {model: mrp.product.produce}: |
+ from tools.translate import _
+ prod_obj = self.pool.get('mrp.production')
+ prod_ids = prod_obj.search(cr, uid, [('product_id.default_code','=','PC1')])
+ self.do_produce(cr, uid, [1], context={'active_ids': prod_ids})
diff --git a/addons/mrp/wizard/__init__.py b/addons/mrp/wizard/__init__.py
index 045d7f1bd71..aa4408e543e 100644
--- a/addons/mrp/wizard/__init__.py
+++ b/addons/mrp/wizard/__init__.py
@@ -20,14 +20,10 @@
##############################################################################
import mrp_product_produce
-import orderpoint_procurement
-import mrp_procurement
-import schedulers_all
import mrp_price
import mrp_workcenter_load
#import mrp_track_prod
import change_production_qty
-import make_procurement_product
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 11e1ec32ec6..43929b47dc7 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -56,33 +56,35 @@ class mrp_track_move(osv.osv_memory):
"""
res = super(mrp_track_move, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
record_id = context and context.get('active_id', False) or False
- if record_id:
- prod_obj = self.pool.get('mrp.production')
- prod = prod_obj.browse(cr, uid, record_id)
- try:
- if prod.state != 'done':
- res['arch'] = '''
-
-
-
-
-
- '''
- else:
- arch_lst = ['
', '']
- for m in [line for line in prod.move_created_ids]:
- quantity = m.product_qty
- res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
- arch_lst.append('\n' %m.id)
- arch_lst.append('')
- arch_lst.append('')
- arch_lst.append('')
- arch_lst.append('')
- arch_lst.append('
')
- res['arch'] = '\n'.join(arch_lst)
- except Exception,e:
- return res
+ active_model = context.get('active_model')
+
+ if not record_id or (active_model and active_model != 'mrp.production'):
+ return res
+
+ prod_obj = self.pool.get('mrp.production')
+ prod = prod_obj.browse(cr, uid, record_id)
+ if prod.state != 'done':
+ res['arch'] = '''
+
+
+
+
+
+ '''
+ else:
+ arch_lst = ['
', '']
+ for m in [line for line in prod.move_created_ids]:
+ quantity = m.product_qty
+ res['fields']['track%s' %m.id] = {'string' : m.product_id.name, 'type' : 'boolean', 'default' : lambda x,y,z: False}
+ arch_lst.append('\n' %m.id)
+ arch_lst.append('')
+ arch_lst.append('')
+ arch_lst.append('')
+ arch_lst.append('')
+ arch_lst.append('
')
+ res['arch'] = '\n'.join(arch_lst)
+
return res
def track_lines(self, cr, uid, ids, context):
diff --git a/addons/mrp_procurement/__init__.py b/addons/mrp_procurement/__init__.py
new file mode 100644
index 00000000000..6cb8ad4027b
--- /dev/null
+++ b/addons/mrp_procurement/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+import mrp_procurement
+import wizard
+import schedulers
+import company
\ No newline at end of file
diff --git a/addons/mrp_procurement/__openerp__.py b/addons/mrp_procurement/__openerp__.py
new file mode 100644
index 00000000000..82c611c6c78
--- /dev/null
+++ b/addons/mrp_procurement/__openerp__.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+
+{
+ "name" : "Procurements",
+ "version" : "1.0",
+ "author" : "Tiny",
+ "website" : "http://www.openerp.com",
+ "category" : "Generic Modules/Production",
+ "depends" : ["base","process", "product", "stock"],
+ "description": """
+ This is the module for computing Procurements.
+ """,
+ 'init_xml': [],
+ 'update_xml': [
+ 'security/ir.model.access.csv',
+ 'security/mrp_procurement_security.xml',
+ 'mrp_procurement_data.xml',
+ 'wizard/make_procurement_view.xml',
+ 'wizard/mrp_procurement_view.xml',
+ 'wizard/orderpoint_procurement_view.xml',
+ 'mrp_procurement_view.xml',
+ 'wizard/schedulers_all_view.xml',
+ 'mrp_procurement_workflow.xml',
+ 'process/procurement_process.xml',
+ "company_view.xml",
+ ],
+# 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
+ 'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_date_check/__openerp__.py b/addons/mrp_procurement/company.py
similarity index 58%
rename from addons/account_date_check/__openerp__.py
rename to addons/mrp_procurement/company.py
index ccac5f6fcbd..ce39ca9a684 100644
--- a/addons/account_date_check/__openerp__.py
+++ b/addons/mrp_procurement/company.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,32 +15,24 @@
# 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 .
+# along with this program. If not, see .
#
##############################################################################
+from osv import osv,fields
+
+class company(osv.osv):
+ _inherit = 'res.company'
+ _columns = {
+ 'schedule_range': fields.float('Scheduler Range', required=True,
+ help="This is the time frame analysed by the scheduler when "\
+ "computing procurements. All procurements that are not between "\
+ "today and today+range are skipped for futur computation."),
+ }
+ _defaults = {
+ 'schedule_range': lambda *a: 80.0,
+ }
+company()
-{
- 'name': 'Account Date check',
- 'version': '1.0',
- 'category': 'Generic Modules/Accounting',
- 'description': """
- * Adds a field on journals: "Allows date not in the period"
- * By default, this field is checked.
-If this field is not checked, the system control that the date is in the
-period when you create an account entry. Otherwise, it generates an
-error message: "The date of your account move is not in the defined
-period !"
- """,
- 'author': 'Tiny',
- 'website': 'http://www.openerp.com',
- 'depends': ['account'],
- 'init_xml': [],
- 'update_xml': ['account_date_check_view.xml'],
- 'demo_xml': [],
- 'installable': True,
- 'active': False,
- 'certificate': '0066174843389',
-}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/company_view.xml b/addons/mrp_procurement/company_view.xml
new file mode 100644
index 00000000000..543e36fe02f
--- /dev/null
+++ b/addons/mrp_procurement/company_view.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ res.company.mrp.config
+ res.company
+ form
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py
new file mode 100644
index 00000000000..bd5b223779f
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement.py
@@ -0,0 +1,527 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from mx import DateTime
+from osv import osv, fields
+from tools.translate import _
+import netsvc
+import time
+
+
+class mrp_property_group(osv.osv):
+ """
+ Group of mrp properties.
+ """
+ _name = 'mrp.property.group'
+ _description = 'Property Group'
+ _columns = {
+ 'name': fields.char('Property Group', size=64, required=True),
+ 'description': fields.text('Description'),
+ }
+mrp_property_group()
+
+class mrp_property(osv.osv):
+ """
+ Properties of mrp.
+ """
+ _name = 'mrp.property'
+ _description = 'Property'
+ _columns = {
+ 'name': fields.char('Name', size=64, required=True),
+ 'composition': fields.selection([('min','min'),('max','max'),('plus','plus')], 'Properties composition', required=True, help="Not used in computations, for information purpose only."),
+ 'group_id': fields.many2one('mrp.property.group', 'Property Group', required=True),
+ 'description': fields.text('Description'),
+ }
+ _defaults = {
+ 'composition': lambda *a: 'min',
+ }
+mrp_property()
+
+# ------------------------------------------------------------------
+# Procurement
+# ------------------------------------------------------------------
+#
+# Produce, Buy or Find products and place a move
+# then wizard for picking lists & move
+#
+class mrp_procurement(osv.osv):
+ """
+ Procurement Orders
+ """
+ _name = "mrp.procurement"
+ _description = "Procurement"
+ _order = 'priority,date_planned'
+
+ _columns = {
+ 'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
+ 'origin': fields.char('Source Document', size=64,
+ help="Reference of the document that created this Procurement.\n"
+ "This is automatically completed by Open ERP."),
+ 'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
+ 'date_planned': fields.datetime('Scheduled date', required=True),
+ 'date_close': fields.datetime('Date Closed'),
+ 'product_id': fields.many2one('product.product', 'Product', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+ 'product_qty': fields.float('Quantity', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+ 'product_uom': fields.many2one('product.uom', 'Product UoM', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+ 'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
+ 'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
+ 'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
+ 'close_move': fields.boolean('Close Move at end', required=True),
+ 'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
+ 'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+ readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
+ " a make to order method."),
+
+ 'note': fields.text('Note'),
+
+ 'property_ids': fields.many2many('mrp.property', 'mrp_procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+
+ 'message': fields.char('Latest error', size=64, help="Exception occurred while computing procurement orders."),
+ 'state': fields.selection([
+ ('draft','Draft'),
+ ('confirmed','Confirmed'),
+ ('exception','Exception'),
+ ('running','Running'),
+ ('cancel','Cancel'),
+ ('ready','Ready'),
+ ('done','Done'),
+ ('waiting','Waiting')], 'State', required=True,
+ help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
+ \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
+ 'note': fields.text('Note'),
+ 'company_id': fields.many2one('res.company','Company',required=True),
+ }
+ _defaults = {
+ 'state': lambda *a: 'draft',
+ 'priority': lambda *a: '1',
+ 'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+ 'close_move': lambda *a: 0,
+ 'procure_method': lambda *a: 'make_to_order',
+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.procurement', context=c)
+ }
+
+ def unlink(self, cr, uid, ids, context=None):
+ procurements = self.read(cr, uid, ids, ['state'])
+ unlink_ids = []
+ for s in procurements:
+ if s['state'] in ['draft','cancel']:
+ unlink_ids.append(s['id'])
+ else:
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
+ return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+
+ def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+ """ Finds UoM and UoS of changed product.
+ @param product_id: Changed id of product.
+ @return: Dictionary of values.
+ """
+ if product_id:
+ w = self.pool.get('product.product').browse(cr, uid, product_id, context)
+ v = {
+ 'product_uom': w.uom_id.id,
+ 'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id
+ }
+ return {'value': v}
+ return {}
+
+ def check_product(self, cr, uid, ids):
+ """ Checks product type.
+ @return: True or False
+ """
+ for procurement in self.browse(cr, uid, ids):
+ if procurement.product_id.type in ('product', 'consu'):
+ return True
+ return False
+
+ def check_move_cancel(self, cr, uid, ids, context={}):
+ """ Checks if move is cancelled or not.
+ @return: True or False.
+ """
+ res = True
+ ok = False
+ for procurement in self.browse(cr, uid, ids, context):
+ if procurement.move_id:
+ ok = True
+ if not procurement.move_id.state == 'cancel':
+ res = False
+ return res and ok
+
+ def check_move_done(self, cr, uid, ids, context={}):
+ """ Checks if move is done or not.
+ @return: True or False.
+ """
+ res = True
+ for proc in self.browse(cr, uid, ids, context):
+ if proc.move_id:
+ if not proc.move_id.state == 'done':
+ res = False
+ return res
+
+ #
+ # This method may be overrided by objects that override mrp.procurment
+ # for computing their own purpose
+ #
+ def _quantity_compute_get(self, cr, uid, proc, context={}):
+ """ Finds sold quantity of product.
+ @param proc: Current procurement.
+ @return: Quantity or False.
+ """
+ if proc.product_id.type == 'product':
+ if proc.move_id.product_uos:
+ return proc.move_id.product_uos_qty
+ return False
+
+ def _uom_compute_get(self, cr, uid, proc, context={}):
+ """ Finds UoS if product is Stockable Product.
+ @param proc: Current procurement.
+ @return: UoS or False.
+ """
+ if proc.product_id.type == 'product':
+ if proc.move_id.product_uos:
+ return proc.move_id.product_uos.id
+ return False
+
+ #
+ # Return the quantity of product shipped/produced/served, wich may be
+ # different from the planned quantity
+ #
+ def quantity_get(self, cr, uid, id, context={}):
+ """ Finds quantity of product used in procurement.
+ @return: Quantity of product.
+ """
+ proc = self.browse(cr, uid, id, context)
+ result = self._quantity_compute_get(cr, uid, proc, context)
+ if not result:
+ result = proc.product_qty
+ return result
+
+ def uom_get(self, cr, uid, id, context=None):
+ """ Finds UoM of product used in procurement.
+ @return: UoM of product.
+ """
+ proc = self.browse(cr, uid, id, context)
+ result = self._uom_compute_get(cr, uid, proc, context)
+ if not result:
+ result = proc.product_uom.id
+ return result
+
+ def check_waiting(self, cr, uid, ids, context=[]):
+ """ Checks state of move.
+ @return: True or False
+ """
+ for procurement in self.browse(cr, uid, ids, context=context):
+ if procurement.move_id and procurement.move_id.state == 'auto':
+ return True
+ return False
+
+ def check_produce_service(self, cr, uid, procurement, context=[]):
+ return True
+
+ def check_produce_product(self, cr, uid, procurement, context=[]):
+ """ Finds BoM of a product if not found writes exception message.
+ @param procurement: Current procurement.
+ @return: True or False.
+ """
+ return True
+
+ def check_make_to_stock(self, cr, uid, ids, context={}):
+ """ Checks product type.
+ @return: True or False
+ """
+ ok = True
+ for procurement in self.browse(cr, uid, ids, context=context):
+ if procurement.product_id.type == 'service':
+ ok = ok and self._check_make_to_stock_service(cr, uid, procurement, context)
+ else:
+ ok = ok and self._check_make_to_stock_product(cr, uid, procurement, context)
+ return ok
+
+ def check_produce(self, cr, uid, ids, context={}):
+ """ Checks product type.
+ @return: True or Product Id.
+ """
+ res = True
+ user = self.pool.get('res.users').browse(cr, uid, uid)
+ for procurement in self.browse(cr, uid, ids):
+ if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
+ if procurement.product_id.seller_ids:
+ partner = procurement.product_id.seller_ids[0].name
+ if user.company_id and user.company_id.partner_id:
+ if partner.id == user.company_id.partner_id.id:
+ return True
+ return False
+ if procurement.product_id.product_tmpl_id.type=='service':
+ res = res and self.check_produce_service(cr, uid, procurement, context)
+ else:
+ res = res and self.check_produce_product(cr, uid, procurement, context)
+ if not res:
+ return False
+ return res
+
+ def check_buy(self, cr, uid, ids):
+ """ Checks product type.
+ @return: True or Product Id.
+ """
+ user = self.pool.get('res.users').browse(cr, uid, uid)
+ partner_obj = self.pool.get('res.partner')
+ for procurement in self.browse(cr, uid, ids):
+ if procurement.product_id.product_tmpl_id.supply_method <> 'buy':
+ return False
+ if not procurement.product_id.seller_ids:
+ cr.execute('update mrp_procurement set message=%s where id=%s', (_('No supplier defined for this product !'), procurement.id))
+ return False
+ partner = procurement.product_id.seller_ids[0].name
+ if user.company_id and user.company_id.partner_id:
+ if partner.id == user.company_id.partner_id.id:
+ return False
+ address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
+ if not address_id:
+ cr.execute('update mrp_procurement set message=%s where id=%s', (_('No address defined for the supplier'), procurement.id))
+ return False
+ return True
+
+ def test_cancel(self, cr, uid, ids):
+ """ Tests whether state of move is cancelled or not.
+ @return: True or False
+ """
+ for record in self.browse(cr, uid, ids):
+ if record.move_id and record.move_id.state == 'cancel':
+ return True
+ return False
+
+ def action_confirm(self, cr, uid, ids, context={}):
+ """ Confirms procurement and writes exception message if any.
+ @return: True
+ """
+ move_obj = self.pool.get('stock.move')
+ for procurement in self.browse(cr, uid, ids):
+ if procurement.product_qty <= 0.00:
+ raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
+ if procurement.product_id.type in ('product', 'consu'):
+ if not procurement.move_id:
+ source = procurement.location_id.id
+ if procurement.procure_method == 'make_to_order':
+ source = procurement.product_id.product_tmpl_id.property_stock_procurement.id
+ id = move_obj.create(cr, uid, {
+ 'name': 'PROC:' + procurement.name,
+ 'location_id': source,
+ 'location_dest_id': procurement.location_id.id,
+ 'product_id': procurement.product_id.id,
+ 'product_qty': procurement.product_qty,
+ 'product_uom': procurement.product_uom.id,
+ 'date_planned': procurement.date_planned,
+ 'state': 'confirmed',
+ 'company_id': procurement.company_id.id,
+ })
+ self.write(cr, uid, [procurement.id], {'move_id': id, 'close_move': 1})
+ else:
+ # TODO: check this
+ if procurement.procure_method == 'make_to_stock' and procurement.move_id.state in ('waiting',):
+ id = move_obj.write(cr, uid, [procurement.move_id.id], {'state':'confirmed'})
+ self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
+ return True
+
+ def action_move_assigned(self, cr, uid, ids, context={}):
+ """ Changes procurement state to Running and writes message.
+ @return: True
+ """
+ self.write(cr, uid, ids, {'state': 'running', 'message': _('from stock: products assigned.')})
+ return True
+
+ def _check_make_to_stock_service(self, cr, uid, procurement, context={}):
+ return True
+
+ def _check_make_to_stock_product(self, cr, uid, procurement, context={}):
+ """ Checks procurement move state.
+ @param procurement: Current procurement.
+ @return: True or move id.
+ """
+ ok = True
+ if procurement.move_id:
+ id = procurement.move_id.id
+ if not (procurement.move_id.state in ('done','assigned','cancel')):
+ ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
+ cr.execute('select count(id) from stock_warehouse_orderpoint where product_id=%s', (procurement.product_id.id,))
+ if not cr.fetchone()[0]:
+ cr.execute('update mrp_procurement set message=%s where id=%s', (_('from stock and no minimum orderpoint rule defined'), procurement.id))
+ return ok
+
+ def action_produce_assign_service(self, cr, uid, ids, context={}):
+ """ Changes procurement state to Running.
+ @return: True
+ """
+ for procurement in self.browse(cr, uid, ids):
+ self.write(cr, uid, [procurement.id], {'state': 'running'})
+ return True
+
+ def action_produce_assign_product(self, cr, uid, ids, context={}):
+ """ This is action which call from workflow to assign production order to procurements
+ @return: True
+ """
+ return 0
+
+
+ def action_po_assign(self, cr, uid, ids, context={}):
+ """ This is action which call from workflow to assign purchase order to procurements
+ @return: True
+ """
+ return 0
+
+ def action_cancel(self, cr, uid, ids):
+ """ Cancels procurement and writes move state to Assigned.
+ @return: True
+ """
+ todo = []
+ todo2 = []
+ move_obj = self.pool.get('stock.move')
+ for proc in self.browse(cr, uid, ids):
+ if proc.close_move:
+ if proc.move_id.state not in ('done', 'cancel'):
+ todo2.append(proc.move_id.id)
+ else:
+ if proc.move_id and proc.move_id.state == 'waiting':
+ todo.append(proc.move_id.id)
+ if len(todo2):
+ move_obj.action_cancel(cr, uid, todo2)
+ if len(todo):
+ move_obj.write(cr, uid, todo, {'state': 'assigned'})
+ self.write(cr, uid, ids, {'state': 'cancel'})
+ wf_service = netsvc.LocalService("workflow")
+ for id in ids:
+ wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+ return True
+
+ def action_check_finnished(self, cr, uid, ids):
+ return self.check_move_done(cr, uid, ids)
+
+ def action_check(self, cr, uid, ids):
+ """ Checks procurement move state whether assigned or done.
+ @return: True
+ """
+ ok = False
+ for procurement in self.browse(cr, uid, ids):
+ if procurement.move_id.state == 'assigned' or procurement.move_id.state == 'done':
+ self.action_done(cr, uid, [procurement.id])
+ ok = True
+ return ok
+
+ def action_ready(self, cr, uid, ids):
+ """ Changes procurement state to Ready.
+ @return: True
+ """
+ res = self.write(cr, uid, ids, {'state': 'ready'})
+ return res
+
+ def action_done(self, cr, uid, ids):
+ """ Changes procurement state to Done and writes Closed date.
+ @return: True
+ """
+ move_obj = self.pool.get('stock.move')
+ for procurement in self.browse(cr, uid, ids):
+ if procurement.move_id:
+ if procurement.close_move and (procurement.move_id.state <> 'done'):
+ move_obj.action_done(cr, uid, [procurement.move_id.id])
+ res = self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')})
+ wf_service = netsvc.LocalService("workflow")
+ for id in ids:
+ wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
+ return res
+
+ def run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+ ''' Runs through scheduler.
+ @param use_new_cursor: False or the dbname
+ '''
+ if not context:
+ context={}
+ self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
+ self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
+ use_new_cursor=use_new_cursor, context=context)
+
+mrp_procurement()
+
+
+class stock_warehouse_orderpoint(osv.osv):
+ """
+ Defines Minimum stock rules.
+ """
+ _name = "stock.warehouse.orderpoint"
+ _description = "Orderpoint minimum rule"
+
+ _columns = {
+ 'name': fields.char('Name', size=32, required=True),
+ 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the orderpoint without removing it."),
+ 'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
+ 'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True),
+ 'location_id': fields.many2one('stock.location', 'Location', required=True),
+ 'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
+ 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
+ 'product_min_qty': fields.float('Min Quantity', required=True,
+ help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+ "a procurement to bring the virtual stock to the Max Quantity."),
+ 'product_max_qty': fields.float('Max Quantity', required=True,
+ help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+ "a procurement to bring the virtual stock to the Max Quantity."),
+ 'qty_multiple': fields.integer('Qty Multiple', required=True,
+ help="The procurement quantity will by rounded up to this multiple."),
+ 'procurement_id': fields.many2one('mrp.procurement', 'Latest procurement'),
+ 'company_id': fields.many2one('res.company','Company',required=True),
+ }
+ _defaults = {
+ 'active': lambda *a: 1,
+ 'logic': lambda *a: 'max',
+ 'qty_multiple': lambda *a: 1,
+ 'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.warehouse.orderpoint') or '',
+ 'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
+ 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
+ }
+
+ def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+ """ Finds location id for changed warehouse.
+ @param warehouse_id: Changed id of warehouse.
+ @return: Dictionary of values.
+ """
+ if warehouse_id:
+ w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
+ v = {'location_id': w.lot_stock_id.id}
+ return {'value': v}
+ return {}
+
+ def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+ """ Finds UoM for changed product.
+ @param product_id: Changed id of product.
+ @return: Dictionary of values.
+ """
+ if product_id:
+ prod = self.pool.get('product.product').browse(cr,uid,product_id)
+ v = {'product_uom': prod.uom_id.id}
+ return {'value': v}
+ return {}
+
+ def copy(self, cr, uid, id, default=None,context={}):
+ if not default:
+ default = {}
+ default.update({
+ 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+ })
+ return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
+
+stock_warehouse_orderpoint()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_procurement/mrp_procurement_data.xml b/addons/mrp_procurement/mrp_procurement_data.xml
new file mode 100644
index 00000000000..256472bd2fd
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_data.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Run mrp scheduler
+
+
+ 1
+ days
+ -1
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement_view.xml b/addons/mrp_procurement/mrp_procurement_view.xml
new file mode 100644
index 00000000000..84b47ee516d
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_view.xml
@@ -0,0 +1,251 @@
+
+
+
+
+
+
+ mrp.procurement.tree
+ mrp.procurement
+ tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+ mrp.procurement.form
+ mrp.procurement
+ form
+
+
+
+
+
+
+ Minimum Stock Rules
+ stock.warehouse.orderpoint
+ ir.actions.act_window
+ form
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/mrp_procurement/mrp_procurement_workflow.xml b/addons/mrp_procurement/mrp_procurement_workflow.xml
new file mode 100644
index 00000000000..46c4a10fffc
--- /dev/null
+++ b/addons/mrp_procurement/mrp_procurement_workflow.xml
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+ mrp.procurement.basic
+ mrp.procurement
+ True
+
+
+
+
+ True
+ draft
+
+
+
+ cancel
+ function
+ action_cancel()
+ True
+
+
+
+ confirm
+ function
+ action_confirm()
+
+
+
+ confirm_wait
+ function
+ write({'state':'exception'})
+
+
+
+ confirm_mts
+
+
+
+ confirm_mto
+
+
+
+ make_to_stock
+ function
+ action_move_assigned()
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ready
+ function
+ action_ready()
+
+
+
+ wait_done
+ function
+ write({'state':'waiting'})
+
+
+
+
+ True
+ done
+ function
+ action_done()
+
+
+
+
+
+ button_confirm
+
+
+
+
+ button_wait_done
+ True
+
+
+
+
+ check_move_done()
+ stock.move
+ [move_id.id]
+
+
+
+
+
+ button_check
+ test_cancel()
+
+
+
+
+ button_check
+ not test_cancel()
+
+
+
+
+ procure_method=='make_to_order'
+
+
+
+
+ procure_method=='make_to_stock'
+
+
+
+
+ button_cancel
+
+
+
+
+ button_cancel
+
+
+
+
+ button_restart
+
+
+
+
+ button_cancel
+
+
+
+
+ button_restart
+
+
+
+
+ button_cancel
+
+
+
+
+ check_make_to_stock()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ action_check_finnished()
+
+
+
+
+ check_move_cancel()
+
+
+
+
diff --git a/addons/mrp_procurement/process/procurement_process.xml b/addons/mrp_procurement/process/procurement_process.xml
new file mode 100644
index 00000000000..21f953c6a6f
--- /dev/null
+++ b/addons/mrp_procurement/process/procurement_process.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/mrp/schedulers.py b/addons/mrp_procurement/schedulers.py
similarity index 99%
rename from addons/mrp/schedulers.py
rename to addons/mrp_procurement/schedulers.py
index cc482d95c52..7a89723e5ca 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp_procurement/schedulers.py
@@ -238,4 +238,5 @@ class mrp_procurement(osv.osv):
cr.close()
return {}
mrp_procurement()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/scripts/scheduler.py b/addons/mrp_procurement/scripts/scheduler.py
similarity index 100%
rename from addons/mrp/scripts/scheduler.py
rename to addons/mrp_procurement/scripts/scheduler.py
diff --git a/addons/mrp_procurement/security/ir.model.access.csv b/addons/mrp_procurement/security/ir.model.access.csv
new file mode 100644
index 00000000000..ce022a730b0
--- /dev/null
+++ b/addons/mrp_procurement/security/ir.model.access.csv
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_mrp_property_group","mrp.property.group","model_mrp_property_group",,1,0,0,0
+"access_mrp_property","mrp.property","model_mrp_property",,1,0,0,0
+"access_mrp_procurement","mrp.procurement","model_mrp_procurement",,1,0,0,0
+"access_stock_warehouse_orderpoint","stock.warehouse.orderpoint","model_stock_warehouse_orderpoint",,1,0,0,0
+"access_mrp_procurement_compute_all","mrp.procurement.compute.all","model_mrp_procurement_compute_all",,1,0,0,0
+"access_mrp_procurement_orderpoint_compute","mrp.procurement.orderpoint.compute","model_mrp_procurement_orderpoint_compute",,1,0,0,0
+"access_mrp_make_procurement","make.procurement","model_make_procurement",,1,0,0,0
+"access_mrp_make_procurement","mrp.procurement.compute","model_mrp_procurement_compute",,1,0,0,0
diff --git a/addons/mrp_procurement/security/mrp_procurement_security.xml b/addons/mrp_procurement/security/mrp_procurement_security.xml
new file mode 100644
index 00000000000..a0f2ef431bf
--- /dev/null
+++ b/addons/mrp_procurement/security/mrp_procurement_security.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ mrp_procurement multi-company
+
+
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
+
+
+
+ stock_warehouse.orderpoint multi-company
+
+
+ ['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]
+
+
+
+
\ No newline at end of file
diff --git a/addons/account_date_check/__init__.py b/addons/mrp_procurement/wizard/__init__.py
similarity index 86%
rename from addons/account_date_check/__init__.py
rename to addons/mrp_procurement/wizard/__init__.py
index cf10f590e86..ae70ffbf941 100644
--- a/addons/account_date_check/__init__.py
+++ b/addons/mrp_procurement/wizard/__init__.py
@@ -19,10 +19,9 @@
#
##############################################################################
-#----------------------------------------------------------
-# Init Sales
-#----------------------------------------------------------
+import orderpoint_procurement
+import mrp_procurement
+import schedulers_all
+import make_procurement_product
-import account_date_check
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mrp/wizard/make_procurement_product.py b/addons/mrp_procurement/wizard/make_procurement_product.py
similarity index 96%
rename from addons/mrp/wizard/make_procurement_product.py
rename to addons/mrp_procurement/wizard/make_procurement_product.py
index a2dd62327bb..96f00b89eb4 100644
--- a/addons/mrp/wizard/make_procurement_product.py
+++ b/addons/mrp_procurement/wizard/make_procurement_product.py
@@ -83,8 +83,8 @@ class make_procurement(osv.osv_memory):
wf_service.trg_validate(uid, 'mrp.procurement', procure_id, 'button_confirm', cr)
- id2 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_tree_view')
- id3 = data_obj._get_id(cr, uid, 'mrp', 'mrp_procurement_form_view')
+ id2 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_tree_view')
+ id3 = data_obj._get_id(cr, uid, 'mrp_procurement', 'mrp_procurement_form_view')
if id2:
id2 = data_obj.browse(cr, uid, id2, context=context).res_id
diff --git a/addons/mrp/wizard/make_procurement_view.xml b/addons/mrp_procurement/wizard/make_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/make_procurement_view.xml
rename to addons/mrp_procurement/wizard/make_procurement_view.xml
diff --git a/addons/mrp/wizard/mrp_procurement.py b/addons/mrp_procurement/wizard/mrp_procurement.py
similarity index 100%
rename from addons/mrp/wizard/mrp_procurement.py
rename to addons/mrp_procurement/wizard/mrp_procurement.py
diff --git a/addons/mrp/wizard/mrp_procurement_view.xml b/addons/mrp_procurement/wizard/mrp_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/mrp_procurement_view.xml
rename to addons/mrp_procurement/wizard/mrp_procurement_view.xml
diff --git a/addons/mrp/wizard/orderpoint_procurement.py b/addons/mrp_procurement/wizard/orderpoint_procurement.py
similarity index 100%
rename from addons/mrp/wizard/orderpoint_procurement.py
rename to addons/mrp_procurement/wizard/orderpoint_procurement.py
diff --git a/addons/mrp/wizard/orderpoint_procurement_view.xml b/addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
similarity index 100%
rename from addons/mrp/wizard/orderpoint_procurement_view.xml
rename to addons/mrp_procurement/wizard/orderpoint_procurement_view.xml
diff --git a/addons/mrp/wizard/schedulers_all.py b/addons/mrp_procurement/wizard/schedulers_all.py
similarity index 100%
rename from addons/mrp/wizard/schedulers_all.py
rename to addons/mrp_procurement/wizard/schedulers_all.py
diff --git a/addons/mrp/wizard/schedulers_all_view.xml b/addons/mrp_procurement/wizard/schedulers_all_view.xml
similarity index 84%
rename from addons/mrp/wizard/schedulers_all_view.xml
rename to addons/mrp_procurement/wizard/schedulers_all_view.xml
index b8b465e03e9..33861287278 100644
--- a/addons/mrp/wizard/schedulers_all_view.xml
+++ b/addons/mrp_procurement/wizard/schedulers_all_view.xml
@@ -30,8 +30,5 @@
key2="client_action_multi"
id="action_compute_schedulers"/>
-
-
-
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 9f629ad8a46..667e9763827 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -115,7 +115,7 @@
-
+
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 371b7ba82e3..ecc88ef6aae 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -57,23 +57,24 @@ class repair_cancel(osv.osv_memory):
@param context: A standard dictionary
@return: New arch of view.
"""
- record_id = context and context.get('active_id', False) or False
res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
- if record_id:
- try:
- repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
- if not repair_order.invoiced:
- res['arch'] = """
-
-
-
-
-
-
-
- """
- except:
- return res
+ record_id = context and context.get('active_id', False) or False
+ active_model = context.get('active_model')
+
+ if not record_id or (active_model and active_model != 'mrp.repair'):
+ return res
+
+ repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
+ if not repair_order.invoiced:
+ res['arch'] = """
+
+
+
+
+
+
+
+ """
return res
repair_cancel()
diff --git a/addons/point_of_sale/__init__.py b/addons/point_of_sale/__init__.py
index 1a83d3f3b44..0baf4639019 100644
--- a/addons/point_of_sale/__init__.py
+++ b/addons/point_of_sale/__init__.py
@@ -21,11 +21,11 @@
##############################################################################
import pos
+import account_bank_statement
+import pos_account_bank_statement
import stock
import wizard
import report
-import pos_account_bank_statement
-import account_bank_statement
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 95228bb044c..111702c2e74 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -37,7 +37,6 @@ Main features :
""",
'author': 'Tiny',
'depends': ['sale', 'delivery'],
-# 'depends': ['sale', 'purchase', 'account', 'account_tax_include','board','mrp','board_manufacturing','delivery','profile_manufacturing','account','multi_company'],
'init_xml': [],
'update_xml': [
@@ -63,8 +62,9 @@ Main features :
'wizard/pos_payment_report.xml',
'wizard/pos_payment.xml',
'wizard/pos_scan_product_view.xml',
+ 'wizard/pos_return_view.xml',
'pos_report.xml',
- 'pos_wizard.xml',
+ # 'pos_wizard.xml',
'pos_view.xml',
'pos_sequence.xml',
'posrule_data.xml',
@@ -73,7 +73,6 @@ Main features :
'statement_view.xml',
'statement_report.xml',
'statement_data.xml',
- 'statement_wizard.xml',
],
'demo_xml': ['pos_demo.xml','singer_statement_demo.xml','multi_company_stock_data.xml'],
'installable': True,
diff --git a/addons/point_of_sale/multi_company_demo.xml b/addons/point_of_sale/multi_company_demo.xml
index dfc59cc09c8..e0e58ad75d7 100644
--- a/addons/point_of_sale/multi_company_demo.xml
+++ b/addons/point_of_sale/multi_company_demo.xml
@@ -2,11 +2,10 @@
- Tiny Editor
+ OpenERP Editor
-
- Tiny Editor
+ OpenERP EditorFree Business Solutions
@@ -15,24 +14,19 @@
-
- Tiny Integrator
+ OpenERP Integrator
- Tiny Integrator
+ OpenERP IntegratorFree Business SolutionsWeb: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701
-
-
-
-
diff --git a/addons/point_of_sale/multi_company_stock_data.xml b/addons/point_of_sale/multi_company_stock_data.xml
index 539a27ff1a2..a74ea0a56e9 100644
--- a/addons/point_of_sale/multi_company_stock_data.xml
+++ b/addons/point_of_sale/multi_company_stock_data.xml
@@ -2,104 +2,6 @@
-
-
-
- property_product_pricelist
-
-
-
-
-
-
property_stock_account_output
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index c87efa486b3..ede0f7bd15c 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -28,7 +28,7 @@ from tools.translate import _
from decimal import Decimal
import tools
import re
-
+import decimal_precision as dp
class pos_config_journal(osv.osv):
@@ -43,40 +43,14 @@ class pos_config_journal(osv.osv):
}
pos_config_journal()
-
-class res_mode_contact(osv.osv):
-
- """ Contact mode for Partner """
-
- _name = "res.mode.contact"
- _description = "Contact mode"
-
- _columns={
- 'name': fields.char('Mode', size=64, select=1),
- 'active': fields.boolean('Active', select=2),
- }
-res_mode_contact()
-
-class contact_mode_partner(osv.osv):
-
-
- _inherit = 'res.partner'
- _columns = {
- 'contact_mode_id': fields.many2one('res.mode.contact','Contact Mode'),
- }
-contact_mode_partner()
-
-
class pos_company_discount(osv.osv):
""" Company Discount and Cashboxes """
_inherit = 'res.company'
_columns = {
- 'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
- 'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
- 'account_receivable': fields.many2one('account.account',
- 'Default Receivable', states={'draft': [('readonly', False)]}),
+ 'company_discount': fields.float('Max Discount(%)', digits_compute= dp.get_precision('Point Of Sale')),
+ 'max_diff': fields.float('Max Difference for Cashboxes', digits_compute= dp.get_precision('Point Of Sale Discount')),
}
pos_company_discount()
@@ -149,7 +123,7 @@ class pos_order(osv.osv):
tot =0.0
val=None
for order in self.browse(cr, uid, ids):
- cr.execute("select date_payment2 from pos_order where id=%d"%(order.id))
+ cr.execute("select date_payment from pos_order where id=%d"%(order.id))
date_p=cr.fetchone()
date_p=date_p and date_p[0] or None
if date_p:
@@ -176,7 +150,7 @@ class pos_order(osv.osv):
tot =0.0
val=None
for order in self.browse(cr, uid, ids):
- cr.execute("select date_payment from pos_order where id=%d"%(order.id))
+ cr.execute("select date_validation from pos_order where id=%d"%(order.id))
date_p=cr.fetchone()
date_p=date_p and date_p[0] or None
if date_p:
@@ -199,65 +173,35 @@ class pos_order(osv.osv):
res[order.id]=val
return res
- def _amount_tax(self, cr, uid, ids, field_name, arg, context):
-
- """ Calculates Taxes of order
- @return: Dictionary of values """
-
- res = {}
- tax_obj = self.pool.get('account.tax')
+ def _amount_all(self, cr, uid, ids, name, args, context=None):
+ tax_obj = self.pool.get('account.tax')
+ res={}
for order in self.browse(cr, uid, ids):
- val = 0.0
+ res[order.id] = {
+ 'amount_paid': 0.0,
+ 'amount_return':0.0,
+ 'amount_tax':0.0,
+ }
+ for payment in order.statement_ids:
+ res[order.id]['amount_paid'] += payment.amount
+ for payment in order.payments:
+ res[order.id]['amount_return'] += (payment.amount < 0 and payment.amount or 0)
for line in order.lines:
if order.price_type!='tax_excluded':
- val = reduce(lambda x, y: x+round(y['amount'], 2),
+ res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
tax_obj.compute_inv(cr, uid, line.product_id.taxes_id,
line.price_unit * \
(1-(line.discount or 0.0)/100.0), line.qty),
- val)
+ res[order.id]['amount_tax'])
else:
- val = reduce(lambda x, y: x+round(y['amount'], 2),
+ res[order.id]['amount_tax'] = reduce(lambda x, y: x+round(y['amount'], 2),
tax_obj.compute(cr, uid, line.product_id.taxes_id,
line.price_unit * \
(1-(line.discount or 0.0)/100.0), line.qty),
- val)
-
- res[order.id] = val
+ res[order.id]['amount_tax'])
return res
-
- def _total_payment(self, cr, uid, ids, field_name, arg, context):
- """ Calculates Total payment of order
- @return: Dictionary of values """
-
- res = {}
- i=0
- for order in self.browse(cr, uid, ids):
- val = 0.0
- for payment in order.statement_ids:
- val += payment.amount
- res[order.id] = val
- return res
- return {order.id:val}
- def _total_return(self, cr, uid, ids, field_name, arg, context):
-
- """ Calculates Total Returned from the order
- @return: Dictionary of values """
-
- res = {}
- for order in self.browse(cr, uid, ids):
- val = 0.0
- for payment in order.payments:
- val += (payment.amount < 0 and payment.amount or 0)
- res[order.id] = val
- return res
-
-# def payment_get(self, cr, uid, ids, context=None):
-# """ Calculates Total Returned from the order
-# @return: Dictionary of values """
-# cr.execute("select id from pos_payment where order_id =ANY(%s)",(ids,))
-# return [i[0] for i in cr.fetchall()]
def _sale_journal_get(self, cr, uid, context):
@@ -279,13 +223,10 @@ class pos_order(osv.osv):
company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
res = self.pool.get('sale.shop').search(cr, uid, [])
- # res = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', company.id)])
if res:
return res[0]
else:
return False
-
-
def copy(self, cr, uid, id, default=None, context={}):
if not default:
@@ -342,16 +283,16 @@ class pos_order(osv.osv):
'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
states={'draft': [('readonly', False)]}, readonly=True),
'date_order': fields.datetime('Date Ordered', readonly=True),
- 'date_payment': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
- 'date_payment2': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
+ 'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
+ 'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
'date_validity': fields.date('Validity Date', required=True),
'user_id': fields.many2one('res.users', 'Connected Salesman', readonly=True),
- 'user_id1': fields.many2one('res.users', 'Salesman', required=True),
- 'user_id2': fields.many2one('res.users', 'Salesman Manager'),
- 'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
+ 'user_salesman_id': fields.many2one('res.users', 'Salesman', required=True),
+ 'sale_manager': fields.many2one('res.users', 'Salesman Manager'),
+ 'amount_tax': fields.function(_amount_all, method=True, string='Taxes',digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
'amount_total': fields.function(_amount_total, method=True, string='Total'),
- 'amount_paid': fields.function(_total_payment, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True),
- 'amount_return': fields.function(_total_return, 'Returned', method=True),
+ 'amount_paid': fields.function(_amount_all, 'Paid', states={'draft': [('readonly', False)]}, readonly=True, method=True,digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
+ 'amount_return': fields.function(_amount_all, 'Returned', method=True,digits_compute=dp.get_precision('Point Of Sale'), multi='all'),
'lines': fields.one2many('pos.order.line', 'order_id', 'Order Lines', states={'draft': [('readonly', False)]}, readonly=True),
'price_type': fields.selection([
('tax_excluded','Tax excluded')
@@ -371,19 +312,9 @@ class pos_order(osv.osv):
'first_name': fields.char('First Name', size=64),
'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
-
- # 'last_name': fields.char('Last Name', size=64),
- # 'street': fields.char('Street', size=64),
- # 'zip2': fields.char('Zip', size=64),
- # 'city': fields.char('City', size=64),
- # 'mobile': fields.char('Mobile', size=64),
- # 'email': fields.char('Email', size=64),
'note': fields.text('Internal Notes'),
'nb_print': fields.integer('Number of Print', readonly=True),
'sale_journal': fields.many2one('account.journal', 'Journal', required=True, states={'draft': [('readonly', False)]}, readonly=True, ),
- # 'account_receivable': fields.many2one('account.account',
- # 'Default Receivable', required=True, states={'draft': [('readonly', False)]},
- # readonly=True, ),
'invoice_wanted': fields.boolean('Create Invoice'),
'note_2': fields.char('Customer Note',size=64),
'type_rec': fields.char('Type of Receipt',size=64),
@@ -419,7 +350,7 @@ class pos_order(osv.osv):
_defaults = {
'user_id': lambda self, cr, uid, context: uid,
- 'user_id2': lambda self, cr, uid, context: uid,
+ 'sale_manager': lambda self, cr, uid, context: uid,
'state': lambda *a: 'draft',
'price_type': lambda *a: 'tax_excluded',
'state_2': lambda *a: 'to_verify',
@@ -565,12 +496,12 @@ class pos_order(osv.osv):
if line.product_id and line.product_id.type=='service':
continue
prop_ids = self.pool.get("ir.property").search(cr, uid, [('name', '=', 'property_stock_customer')])
- val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value
+ val = self.pool.get("ir.property").browse(cr, uid, prop_ids[0]).value_reference
cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order.shop_id.warehouse_id.id))
res=cr.fetchone()
location_id=res and res[0] or None
# location_id = order and order.shop_id and order.shop_id.warehouse_id and order.shop_id.warehouse_id.lot_stock_id.id or None
- stock_dest_id = int(val.split(',')[1])
+ stock_dest_id = val.id
if line.qty < 0:
location_id, stock_dest_id = stock_dest_id, location_id
@@ -626,7 +557,7 @@ class pos_order(osv.osv):
def button_validate(self, cr, uid, ids, *args):
- """ Check the access for the sale order and update the date_payment
+ """ Check the access for the sale order and update the date_validation
@return: True
"""
res_obj = self.pool.get('res.company')
@@ -637,12 +568,12 @@ class pos_order(osv.osv):
if part_company:
raise osv.except_osv(_('Error'), _('You don\'t have enough access to validate this sale!'))
for order in self.browse(cr, uid, ids):
- if not order.date_payment:
+ if not order.date_validation:
cr.execute("select max(date) from account_bank_statement_line where pos_statement_id=%d"%(order.id))
val=cr.fetchone()
val=val and val[0] or None
if val:
- cr.execute("Update pos_order set date_payment='%s' where id = %d"%(val, order.id))
+ cr.execute("Update pos_order set date_validation='%s' where id = %d"%(val, order.id))
return True
@@ -679,7 +610,7 @@ class pos_order(osv.osv):
if 'payment_name' in data.keys():
args['name'] = data['payment_name'] + ' ' +order.name
account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
- args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
+ args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
if data.get('is_acc',False):
args['is_acc']=data['is_acc']
args['account_id']= prod_obj.browse(cr,uid, data['product_id']).property_account_income and prod_obj.browse(cr,uid, data['product_id']).property_account_income.id
@@ -772,7 +703,7 @@ class pos_order(osv.osv):
inv_ids = []
for order in self.browse(cr, uid, ids, context):
- curr_c = order.user_id1.company_id
+ curr_c = order.user_salesman_id.company_id
if order.invoice_id:
inv_ids.append(order.invoice_id.id)
continue
@@ -780,9 +711,7 @@ class pos_order(osv.osv):
if not order.partner_id:
raise osv.except_osv(_('Error'), _('Please provide a partner for the sale.'))
- cr.execute('select a.id from account_account a, res_company p where p.account_receivable=a.id and p.id=%s', (curr_c.id, ))
- res=cr.fetchone()
- acc=res and res[0] or None
+ acc= order.partner_id.property_account_receivable.id
inv = {
'name': 'Invoice from POS: '+order.name,
'origin': order.name,
@@ -834,15 +763,17 @@ class pos_order(osv.osv):
account_move_line_obj = self.pool.get('account.move.line')
account_period_obj = self.pool.get('account.period')
account_tax_obj = self.pool.get('account.tax')
+ res_obj=self.pool.get('res.users')
+ property_obj=self.pool.get('ir.property')
period = account_period_obj.find(cr, uid, context=context)[0]
for order in self.browse(cr, uid, ids, context=context):
- curr_c = self.pool.get('res.users').browse(cr, uid, uid).company_id
- comp_id = self.pool.get('res.users').browse(cr, order.user_id.id, order.user_id.id).company_id
+ curr_c =res_obj.browse(cr, uid, uid).company_id
+ comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id
comp_id=comp_id and comp_id.id or False
to_reconcile = []
group_tax = {}
- account_def = self.pool.get('ir.property').get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
+ account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
order_account = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def or curr_c.account_receivable.id
# Create an entry for the sale
@@ -1028,9 +959,8 @@ class pos_order(osv.osv):
'statement_id': False,
'account_id':order_account
})
- # account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
+
self.write(cr,uid,order.id,{'state':'done'})
- # account_move_line_obj.reconcile(cr, uid, to_reconcile, type='manual', context=context)
return True
def cancel_picking(self, cr, uid, ids, context=None):
@@ -1042,6 +972,7 @@ class pos_order(osv.osv):
def action_payment(self, cr, uid, ids, context=None):
vals = {'state': 'payment'}
+ sequence_obj=self.pool.get('ir.sequence')
for pos in self.browse(cr, uid, ids):
create_contract_nb = False
for line in pos.lines:
@@ -1049,8 +980,8 @@ class pos_order(osv.osv):
create_contract_nb = True
break
if create_contract_nb:
- seq = self.pool.get('ir.sequence').get(cr, uid, 'pos.user_%s' % pos.user_id1.login)
- vals['contract_number'] ='%s-%s' % (pos.user_id1.login, seq)
+ seq = sequence_obj.get(cr, uid, 'pos.user_%s' % pos.user_salesman_id.login)
+ vals['contract_number'] ='%s-%s' % (pos.user_salesman_id.login, seq)
self.write(cr, uid, ids, vals)
def action_paid(self, cr, uid, ids, context=None):
@@ -1071,7 +1002,6 @@ class pos_order(osv.osv):
for order in self.browse(cr, uid, ids, context=context):
if not order.journal_entry:
self.create_account_move(cr, uid, ids, context={})
- #self.write(cr, uid, ids, {'state': 'done'})
return True
def compute_state(self, cr, uid, id):
@@ -1145,7 +1075,6 @@ class pos_order_line(osv.osv):
price = self.price_by_product(cr, uid, ids, line.order_id.pricelist_id.id, line.product_id.id, line.qty, line.order_id.partner_id.id)
if line.discount!=0.0:
res[line.id] = line.price_unit * line.qty * (1 - (line.discount or 0.0) / 100.0)
-# res[line.id] = price * line.qty * (1 - (line.discount or 0.0) / 100.0)
else:
res[line.id]=line.price_unit*line.qty
return res
@@ -1181,7 +1110,7 @@ class pos_order_line(osv.osv):
disc=0.0
if (disc != 0.0 or prod_id) and price_f>0:
disc=100-(price/price_f*100)
- return {'value':{'discount':disc, 'price_unit':price_f}}#,'notice':''}}#, 'price_subtotal':(price_f*qty*(1-disc))}}
+ return {'value':{'discount':disc, 'price_unit':price_f}}
return {}
def onchange_ded(self, cr, uid,ids, val_ded,price_u,*a):
@@ -1218,11 +1147,9 @@ class pos_order_line(osv.osv):
'company_id':fields.many2one('res.company', 'Company', required=True),
'notice': fields.char('Discount Notice', size=128, required=True),
'serial_number': fields.char('Serial Number', size=128),
-# 'contract_number': fields.char('Contract Number', size=512),
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], required=True, change_default=True),
-# 'price_unit': fields.float('Unit Price'),
'price_unit': fields.function(_get_amount, method=True, string='Unit Price', store=True),
- 'price_ded': fields.float('Discount(Amount)'),
+ 'price_ded': fields.float('Discount(Amount)',digits_compute=dp.get_precision('Point Of Sale')),
'qty': fields.float('Quantity'),
'qty_rfd': fields.float('Refunded Quantity'),
'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal w/o Tax'),
@@ -1283,7 +1210,7 @@ class pos_order_line(osv.osv):
}
line_id = self.create(cr, uid, vals)
if not line_id:
- raise wizard.except_wizard(_('Error'), _('Create line failed !'))
+ raise osv.except_osv(_('Error'), _('Create line failed !'))
else:
vals = {
'qty': qty,
@@ -1348,226 +1275,8 @@ class pos_payment(osv.osv):
pos_payment()
-
-class report_transaction_pos(osv.osv):
- _name = "report.transaction.pos"
- _description = "transaction for the pos"
- _auto = False
- _columns = {
- 'date_create': fields.char('Date', size=16, readonly=True),
- 'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
- 'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
- 'user_id': fields.many2one('res.users', 'User', readonly=True),
- 'no_trans': fields.float('Number of Transaction', readonly=True),
- 'amount': fields.float('Amount', readonly=True),
- 'invoice_id': fields.float('Nbr Invoice', readonly=True),
- 'invoice_am': fields.float('Invoice Amount', readonly=True),
- 'product_nb': fields.float('Product Nb.', readonly=True),
- 'disc': fields.float('Disc.', readonly=True),
- }
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'report_transaction_pos')
- cr.execute("""
- create or replace view report_transaction_pos as (
- select
- min(absl.id) as id,
- count(absl.id) as no_trans,
- sum(absl.amount) as amount,
- sum(line.price_ded) as disc,
- to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
- po.user_id as user_id,
- po.sale_journal as journal_id,
- abs.journal_id as jl_id,
- count(po.invoice_id) as invoice_id,
- count(p.id) as product_nb
- from
- account_bank_statement_line as absl,
- account_bank_statement as abs,
- product_product as p,
- pos_order_line as line,
- pos_order as po
- where
- absl.pos_statement_id = po.id and
- line.order_id=po.id and
- line.product_id=p.id and
- absl.statement_id=abs.id
-
- group by
- po.user_id,po.sale_journal, abs.journal_id,
- to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
- )
- """)
- #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
- #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
-report_transaction_pos()
-
-class report_sales_by_user_pos(osv.osv):
- _name = "report.sales.by.user.pos"
- _description = "Sales by user"
- _auto = False
- _columns = {
- 'date_order': fields.date('Order Date',required=True, select=True),
- 'amount': fields.float('Total', readonly=True, select=True),
- 'qty': fields.float('Quantity', readonly=True, select=True),
- 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
- }
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
- cr.execute("""
- create or replace view report_sales_by_user_pos as (
- select
- min(po.id) as id,
- to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
- po.user_id as user_id,
- sum(pol.qty)as qty,
- sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
- from
- pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
- where
- pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
- group by
- to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
- po.user_id
-
- )
- """)
-report_sales_by_user_pos()
-
-class report_sales_by_user_pos_month(osv.osv):
- _name = "report.sales.by.user.pos.month"
- _description = "Sales by user monthly"
- _auto = False
- _columns = {
- 'date_order': fields.date('Order Date',required=True, select=True),
- 'amount': fields.float('Total', readonly=True, select=True),
- 'qty': fields.float('Quantity', readonly=True, select=True),
- 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
- }
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
- cr.execute("""
- create or replace view report_sales_by_user_pos_month as (
- select
- min(po.id) as id,
- to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
- po.user_id as user_id,
- sum(pol.qty)as qty,
- sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
- from
- pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
- where
- pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
- group by
- to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
- po.user_id
-
- )
- """)
-report_sales_by_user_pos_month()
-
-class report_sales_by_margin_pos(osv.osv):
- _name = "report.sales.by.margin.pos"
- _description = "Sales by margin"
- _auto = False
- _columns = {
-# 'pos_name': fields.char('POS Order', size=64, readonly=True),
- 'product_name':fields.char('Product Name', size=64, readonly=True),
- 'date_order': fields.date('Order Date',required=True, select=True),
- # 'amount': fields.float('Total', readonly=True, select=True),
- 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
- 'qty': fields.float('Qty', readonly=True, select=True),
- 'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
- 'total':fields.float('Margin', readonly=True, select=True),
-
- }
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
- cr.execute("""
- create or replace view report_sales_by_margin_pos as (
- select
- min(pol.id) as id,
- po.user_id as user_id,
- pt.name as product_name,
- to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
- sum(pol.qty) as qty,
- pt.list_price-pt.standard_price as net_margin_per_qty,
- (pt.list_price-pt.standard_price) *sum(pol.qty) as total
- from
- product_template as pt,
- product_product as pp,
- pos_order_line as pol,
- pos_order as po
- where
- pol.product_id = pp.product_tmpl_id and
- pp.product_tmpl_id = pt.id and
- po.id = pol.order_id
-
- group by
- pt.name,
- pt.list_price,
- pt.standard_price,
- po.user_id,
- to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
-
- )
- """)
-report_sales_by_margin_pos()
-
-class report_sales_by_margin_pos_month(osv.osv):
- _name = "report.sales.by.margin.pos.month"
- _description = "Sales by margin monthly"
- _auto = False
- _columns = {
-# 'pos_name': fields.char('POS Order', size=64, readonly=True),
- 'product_name':fields.char('Product Name', size=64, readonly=True),
- 'date_order': fields.date('Order Date',required=True, select=True),
- #'amount': fields.float('Total', readonly=True, select=True),
- 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
- 'qty': fields.float('Qty', readonly=True, select=True),
- 'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
- 'total':fields.float('Margin', readonly=True, select=True),
-
- }
-
- def init(self, cr):
- tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
- cr.execute("""
- create or replace view report_sales_by_margin_pos_month as (
- select
- min(pol.id) as id,
- po.user_id as user_id,
- pt.name as product_name,
- to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
- sum(pol.qty) as qty,
- pt.list_price-pt.standard_price as net_margin_per_qty,
- (pt.list_price-pt.standard_price) *sum(pol.qty) as total
- from
- product_template as pt,
- product_product as pp,
- pos_order_line as pol,
- pos_order as po
- where
- pol.product_id = pp.product_tmpl_id and
- pp.product_tmpl_id = pt.id and
- po.id = pol.order_id
-
- group by
- pt.name,
- pt.list_price,
- pt.standard_price,
- po.user_id,
- to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
-
- )
- """)
-report_sales_by_margin_pos_month()
-
-
class account_move_line(osv.osv):
+
_inherit = 'account.move.line'
def create(self, cr, user, vals, context={}):
pos_obj = self.pool.get('pos.order')
@@ -1587,7 +1296,9 @@ account_move_line()
class account_move(osv.osv):
+
_inherit = 'account.move'
+
def create(self, cr, user, vals, context={}):
pos_obj = self.pool.get('pos.order')
val_name = vals.get('name', '')
diff --git a/addons/point_of_sale/pos_account_bank_statement.py b/addons/point_of_sale/pos_account_bank_statement.py
index ccce315fe36..60924350014 100644
--- a/addons/point_of_sale/pos_account_bank_statement.py
+++ b/addons/point_of_sale/pos_account_bank_statement.py
@@ -65,4 +65,3 @@ class account_bank_statement_line(osv.osv):
account_bank_statement_line()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/point_of_sale/pos_data.xml b/addons/point_of_sale/pos_data.xml
index 8ff4697804e..b36bd0827c2 100644
--- a/addons/point_of_sale/pos_data.xml
+++ b/addons/point_of_sale/pos_data.xml
@@ -11,7 +11,6 @@
0.00.0
-
@@ -22,7 +21,6 @@
100.0100.0
-
diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml
index 789d96b897d..b75f4362578 100644
--- a/addons/point_of_sale/pos_demo.xml
+++ b/addons/point_of_sale/pos_demo.xml
@@ -57,8 +57,8 @@
-
-
+
+
@@ -93,8 +93,8 @@
-
-
+
+
@@ -135,8 +135,8 @@
-
-
+
+
@@ -144,16 +144,6 @@
-
-
@@ -194,12 +184,6 @@ do black box testing on entries on this chart of account, without modifying
your own chart of account.
-
diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index 2e9ff5e6107..9123502d288 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -1,39 +1,6 @@
-
-
-
-
-
+
@@ -58,28 +58,14 @@
states="paid, draft"
attrs="{'invisible':[('state_2','=','accepted')]}"/>
-
-
-
-
-
-
+
-
-
-
-
-
-
+
@@ -90,14 +76,14 @@
-
+
-
-
+
+
@@ -122,7 +108,6 @@
-
@@ -135,8 +120,6 @@
-
-
Point of Saleir.actions.act_window
@@ -145,8 +128,6 @@
[['date_order','>=',time.strftime('%Y-%m-%d')]]
-
-
Salespos.order
@@ -155,8 +136,8 @@
+
-
@@ -165,10 +146,38 @@
+
+ pos.order.list.select
+ pos.order
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
@@ -176,10 +185,12 @@
ir.actions.act_windowpos.orderform
+ tree,form['|',('state_2','=','to_verify'),('state','=','advance')]
+
+
-invoiced
Sales to Invoice
@@ -189,6 +200,8 @@ invoiced
tree,form[('state','!=', 'invoiced')]
+
+
@@ -198,8 +211,8 @@ invoiced
pos.orderformtree,form
- [('state','=', 'paid')]
+ Point of Sale
@@ -207,29 +220,25 @@ invoiced
pos.orderformtree,form
- [('date_order','<=', time.strftime('%Y-%m-%d 23:59:59'))]
+
-
-
Point of Saleir.actions.act_windowpos.orderformtree,form
-
+
-
-
Opened Salesir.actions.act_windowpos.orderformform,tree
-
+
@@ -663,59 +672,11 @@ invoiced
-
-
-
- Contact Mode
- res.mode.contact
- form
-
-
-
-
-
-
-
-
-
- Contact Mode
- res.mode.contact
- tree
-
-
-
-
-
-
-
-
-
- Contact Mode
- ir.actions.act_window
- res.mode.contact
- form
- tree,form
-
-
-
-
-
- view.partner.contact
- res.partner
- form
-
-
-
-
-
-
-
-
product.normal.form.inheritproduct.product
@@ -748,7 +709,6 @@ invoiced
-
@@ -829,13 +789,6 @@ invoiced
parent="menu_point_config_product"
action="action_product_output"
id="products_for_output_operations"/>
-
-
@@ -845,22 +798,12 @@ invoiced
action="action_box_entries"
id="menu_wizard_enter_jrnl" sequence="3" />
-
-
-
-
-
POS Salespos.order
@@ -870,8 +813,8 @@ invoiced
+
-
@@ -888,8 +831,6 @@ invoiced
form
-
-
POS Sales Linespos.order.line
@@ -912,7 +853,6 @@ invoiced
form
-
@@ -926,8 +866,6 @@ invoiced
id="menu_action_sale_of_day_tree2" action="action_trans_pos_tree_today"/>
-
@@ -975,11 +913,6 @@ invoiced
-
-
-
diff --git a/addons/point_of_sale/pos_wizard.xml b/addons/point_of_sale/pos_wizard.xml
index 50e3630c4d7..4a321d7787f 100644
--- a/addons/point_of_sale/pos_wizard.xml
+++ b/addons/point_of_sale/pos_wizard.xml
@@ -1,74 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/point_of_sale/pos_workflow.xml b/addons/point_of_sale/pos_workflow.xml
index d3f1313c13f..11cd9481343 100644
--- a/addons/point_of_sale/pos_workflow.xml
+++ b/addons/point_of_sale/pos_workflow.xml
@@ -66,7 +66,6 @@
done
-
diff --git a/addons/point_of_sale/posrule_data.xml b/addons/point_of_sale/posrule_data.xml
index 1c58c50b43e..5fa46ad43a8 100644
--- a/addons/point_of_sale/posrule_data.xml
+++ b/addons/point_of_sale/posrule_data.xml
@@ -1,61 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -82,23 +27,18 @@
-
-
-
-
-
-
-
-
-
+ POS line
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
-
+
@@ -123,42 +63,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]
+
+
-
+
-
-
-
-
+
+ ['|',('user_id','=',False),('user_id','=',[user.id])]
@@ -176,7 +95,7 @@
ref('stock.menu_action_picking_tree7'),
ref('stock.menu_action_picking_tree8'),
ref('stock.menu_action_picking_tree9'),
- ref('mrp.menu_mrp_procurement_action3'),
+ ref('mrp_procurement.menu_mrp_procurement_action3'),
ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
@@ -213,7 +132,7 @@
-
+
@@ -287,7 +206,7 @@
-
+
@@ -555,7 +474,7 @@
-
+
@@ -577,13 +496,8 @@
id="stock.next_id_61"
name="Reporting"
parent="stock.menu_stock_root" groups="base.group_user"/>
-
-
-
-
-
-
+
diff --git a/addons/point_of_sale/posrule_data2.xml b/addons/point_of_sale/posrule_data2.xml
index 680ae25d7b7..927584e92ce 100644
--- a/addons/point_of_sale/posrule_data2.xml
+++ b/addons/point_of_sale/posrule_data2.xml
@@ -177,7 +177,7 @@
ref('stock.menu_action_picking_tree7'),
ref('stock.menu_action_picking_tree8'),
ref('stock.menu_action_picking_tree9'),
- ref('mrp.menu_mrp_procurement_action3'),
+ ref('mrp_procurement.menu_mrp_procurement_action3'),
ref('point_of_sale.menu_point_root')])]" name="menu_access"/>
@@ -214,7 +214,7 @@
-
+
@@ -557,7 +557,7 @@
-
+
diff --git a/addons/point_of_sale/report/__init__.py b/addons/point_of_sale/report/__init__.py
index a5798add7b4..4af503ff9da 100644
--- a/addons/point_of_sale/report/__init__.py
+++ b/addons/point_of_sale/report/__init__.py
@@ -36,5 +36,6 @@ import pos_payment_report_user
import pos_sales_user_today_current_user
import pos_receipt_with_remboursment
import pos_receipt_without_remboursment
+import point_of_sale_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/report/point_of_sale_report.py b/addons/point_of_sale/report/point_of_sale_report.py
new file mode 100644
index 00000000000..10ba94662a2
--- /dev/null
+++ b/addons/point_of_sale/report/point_of_sale_report.py
@@ -0,0 +1,242 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import osv, fields
+import time
+import netsvc
+import tools
+
+class report_transaction_pos(osv.osv):
+ _name = "report.transaction.pos"
+ _description = "transaction for the pos"
+ _auto = False
+ _columns = {
+ 'date_create': fields.char('Date', size=16, readonly=True),
+ 'journal_id': fields.many2one('account.journal', 'Sales Journal', readonly=True),
+ 'jl_id': fields.many2one('account.journal', 'Cash Journals', readonly=True),
+ 'user_id': fields.many2one('res.users', 'User', readonly=True),
+ 'no_trans': fields.float('Number of Transaction', readonly=True),
+ 'amount': fields.float('Amount', readonly=True),
+ 'invoice_id': fields.float('Nbr Invoice', readonly=True),
+ 'invoice_am': fields.float('Invoice Amount', readonly=True),
+ 'product_nb': fields.float('Product Nb.', readonly=True),
+ 'disc': fields.float('Disc.', readonly=True),
+ }
+
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_transaction_pos')
+ cr.execute("""
+ create or replace view report_transaction_pos as (
+ select
+ min(absl.id) as id,
+ count(absl.id) as no_trans,
+ sum(absl.amount) as amount,
+ sum(line.price_ded) as disc,
+ to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+ po.user_id as user_id,
+ po.sale_journal as journal_id,
+ abs.journal_id as jl_id,
+ count(po.invoice_id) as invoice_id,
+ count(p.id) as product_nb
+ from
+ account_bank_statement_line as absl,
+ account_bank_statement as abs,
+ product_product as p,
+ pos_order_line as line,
+ pos_order as po
+ where
+ absl.pos_statement_id = po.id and
+ line.order_id=po.id and
+ line.product_id=p.id and
+ absl.statement_id=abs.id
+
+ group by
+ po.user_id,po.sale_journal, abs.journal_id,
+ to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text
+ )
+ """)
+ #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')
+ #to_char(date_trunc('day',absl.create_date),'YYYY-MM-DD')::text as date_create,
+report_transaction_pos()
+
+class report_sales_by_user_pos(osv.osv):
+ _name = "report.sales.by.user.pos"
+ _description = "Sales by user"
+ _auto = False
+ _columns = {
+ 'date_order': fields.date('Order Date',required=True, select=True),
+ 'amount': fields.float('Total', readonly=True, select=True),
+ 'qty': fields.float('Quantity', readonly=True, select=True),
+ 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+ }
+
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_sales_by_user_pos')
+ cr.execute("""
+ create or replace view report_sales_by_user_pos as (
+ select
+ min(po.id) as id,
+ to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+ po.user_id as user_id,
+ sum(pol.qty)as qty,
+ sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+ from
+ pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+ where
+ pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+ group by
+ to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text,
+ po.user_id
+
+ )
+ """)
+report_sales_by_user_pos()
+
+class report_sales_by_user_pos_month(osv.osv):
+ _name = "report.sales.by.user.pos.month"
+ _description = "Sales by user monthly"
+ _auto = False
+ _columns = {
+ 'date_order': fields.date('Order Date',required=True, select=True),
+ 'amount': fields.float('Total', readonly=True, select=True),
+ 'qty': fields.float('Quantity', readonly=True, select=True),
+ 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+ }
+
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_sales_by_user_pos_month')
+ cr.execute("""
+ create or replace view report_sales_by_user_pos_month as (
+ select
+ min(po.id) as id,
+ to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+ po.user_id as user_id,
+ sum(pol.qty)as qty,
+ sum((pol.price_unit * pol.qty * (1 - (pol.discount) / 100.0))) as amount
+ from
+ pos_order as po,pos_order_line as pol,product_product as pp,product_template as pt
+ where
+ pt.id=pp.product_tmpl_id and pp.id=pol.product_id and po.id = pol.order_id
+ group by
+ to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text,
+ po.user_id
+
+ )
+ """)
+report_sales_by_user_pos_month()
+
+class report_sales_by_margin_pos(osv.osv):
+ _name = "report.sales.by.margin.pos"
+ _description = "Sales by margin"
+ _auto = False
+ _columns = {
+# 'pos_name': fields.char('POS Order', size=64, readonly=True),
+ 'product_name':fields.char('Product Name', size=64, readonly=True),
+ 'date_order': fields.date('Order Date',required=True, select=True),
+ # 'amount': fields.float('Total', readonly=True, select=True),
+ 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+ 'qty': fields.float('Qty', readonly=True, select=True),
+ 'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+ 'total':fields.float('Margin', readonly=True, select=True),
+
+ }
+
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos')
+ cr.execute("""
+ create or replace view report_sales_by_margin_pos as (
+ select
+ min(pol.id) as id,
+ po.user_id as user_id,
+ pt.name as product_name,
+ to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text as date_order,
+ sum(pol.qty) as qty,
+ pt.list_price-pt.standard_price as net_margin_per_qty,
+ (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+ from
+ product_template as pt,
+ product_product as pp,
+ pos_order_line as pol,
+ pos_order as po
+ where
+ pol.product_id = pp.product_tmpl_id and
+ pp.product_tmpl_id = pt.id and
+ po.id = pol.order_id
+
+ group by
+ pt.name,
+ pt.list_price,
+ pt.standard_price,
+ po.user_id,
+ to_char(date_trunc('day',po.date_order),'YYYY-MM-DD')::text
+
+ )
+ """)
+report_sales_by_margin_pos()
+
+class report_sales_by_margin_pos_month(osv.osv):
+ _name = "report.sales.by.margin.pos.month"
+ _description = "Sales by margin monthly"
+ _auto = False
+ _columns = {
+
+ 'product_name':fields.char('Product Name', size=64, readonly=True),
+ 'date_order': fields.date('Order Date',required=True, select=True),
+ 'user_id': fields.many2one('res.users', 'User', readonly=True, select=True),
+ 'qty': fields.float('Qty', readonly=True, select=True),
+ 'net_margin_per_qty':fields.float('Net margin per Qty', readonly=True, select=True),
+ 'total':fields.float('Margin', readonly=True, select=True),
+
+ }
+
+ def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_sales_by_margin_pos_month')
+ cr.execute("""
+ create or replace view report_sales_by_margin_pos_month as (
+ select
+ min(pol.id) as id,
+ po.user_id as user_id,
+ pt.name as product_name,
+ to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text as date_order,
+ sum(pol.qty) as qty,
+ pt.list_price-pt.standard_price as net_margin_per_qty,
+ (pt.list_price-pt.standard_price) *sum(pol.qty) as total
+ from
+ product_template as pt,
+ product_product as pp,
+ pos_order_line as pol,
+ pos_order as po
+ where
+ pol.product_id = pp.product_tmpl_id and
+ pp.product_tmpl_id = pt.id and
+ po.id = pol.order_id
+
+ group by
+ pt.name,
+ pt.list_price,
+ pt.standard_price,
+ po.user_id,
+ to_char(date_trunc('month',po.date_order),'YYYY-MM-DD')::text
+
+ )
+ """)
+report_sales_by_margin_pos_month()
+
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 1d2e6edc9d0..d615fc74534 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -103,7 +103,7 @@
Tel : [[ address and address.phone ]]E-mail : [[ address and address.email ]]Shop : [[ o.shop_id.name ]]
- Vendeur : [[ o.user_id1.name ]]
+ Vendeur : [[ o.user_salesman_id.name ]]Date : [[ formatLang(o.date_order,date = True) ]]
diff --git a/addons/point_of_sale/sale_wizard.xml b/addons/point_of_sale/sale_wizard.xml
deleted file mode 100644
index ca741e2c808..00000000000
--- a/addons/point_of_sale/sale_wizard.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 0cfc0fae9b7..599df9581ee 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -13,7 +13,6 @@
"access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","point_of_sale.group_pos_user",1,0,0,0
"access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
"access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","point_of_sale.group_pos_user",1,1,1,1
-"access_res_mode_contact","res.mode.contact","model_res_mode_contact","point_of_sale.group_pos_user",1,0,0,0
"access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","point_of_sale.group_pos_user",1,0,0,0
"access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","point_of_sale.group_pos_user",1,0,0,0
"access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0
diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
index edc8299c609..68f889cddee 100644
--- a/addons/point_of_sale/singer_statement_demo.xml
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -316,17 +316,6 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/point_of_sale/statement_data.xml b/addons/point_of_sale/statement_data.xml
index 947348a990d..67c94170666 100644
--- a/addons/point_of_sale/statement_data.xml
+++ b/addons/point_of_sale/statement_data.xml
@@ -21,19 +21,19 @@
-
+
-
+
-
+
diff --git a/addons/point_of_sale/statement_view.xml b/addons/point_of_sale/statement_view.xml
index 80b2b1ec756..cef2748b5e4 100644
--- a/addons/point_of_sale/statement_view.xml
+++ b/addons/point_of_sale/statement_view.xml
@@ -434,7 +434,11 @@
string="Close Register"
action="action_pos_close_statement"
id="menu_close_statement" sequence="2" />
-
+
+
diff --git a/addons/point_of_sale/stock.py b/addons/point_of_sale/stock.py
index 95630569a7c..9d2b24d69b8 100644
--- a/addons/point_of_sale/stock.py
+++ b/addons/point_of_sale/stock.py
@@ -30,7 +30,6 @@ class stock_picking(osv.osv):
_inherit = 'stock.picking'
_columns = {
'pos_order': fields.many2one('pos.order', 'Pos order'),
- # 'company_id':fields.many2one('res.company', 'Company', required=True),
}
stock_picking()
diff --git a/addons/point_of_sale/wizard/__init__.py b/addons/point_of_sale/wizard/__init__.py
index cdfd3f9fb20..d8a4b93e3a2 100644
--- a/addons/point_of_sale/wizard/__init__.py
+++ b/addons/point_of_sale/wizard/__init__.py
@@ -19,7 +19,7 @@
# along with this program. If not, see .
#
##############################################################################
-import wizard_return
+
import pos_add_product
import pos_confirm
import pos_discount
@@ -39,6 +39,7 @@ import pos_payment_report_date
import pos_payment_report
import pos_payment
import pos_scan_product
+import pos_return
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_add_product.py b/addons/point_of_sale/wizard/pos_add_product.py
index 34769be78e9..5d88b75d7ff 100644
--- a/addons/point_of_sale/wizard/pos_add_product.py
+++ b/addons/point_of_sale/wizard/pos_add_product.py
@@ -61,7 +61,27 @@ class add_product(osv.osv_memory):
'views': False,
'type': 'ir.actions.act_window',
}
+ def close_action(self, cr, uid, ids, context):
+ record_id = context and context.get('active_id', False)
+ order_obj= self.pool.get('pos.order')
+ order_line_obj= self.pool.get('pos.order.line')
+ obj=order_obj.browse(cr,uid, record_id)
+ order_obj.write(cr,uid,[record_id],{'state':'done'})
+ if obj.amount_total != obj.amount_paid:
+ return {
+ 'name': _('Make Payment'),
+ 'context ':context and context.get('active_id', False),
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'pos.make.payment',
+ 'view_id': False,
+ 'target': 'new',
+ 'views': False,
+ 'type': 'ir.actions.act_window',
+
+ }
+ return {}
add_product()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/wizard/pos_add_product.xml b/addons/point_of_sale/wizard/pos_add_product.xml
index 5d380624f0d..f465f97f097 100644
--- a/addons/point_of_sale/wizard/pos_add_product.xml
+++ b/addons/point_of_sale/wizard/pos_add_product.xml
@@ -12,8 +12,8 @@
-
+
diff --git a/addons/point_of_sale/wizard/pos_details.xml b/addons/point_of_sale/wizard/pos_details.xml
index 077e2ed89dc..bb62b94fb75 100644
--- a/addons/point_of_sale/wizard/pos_details.xml
+++ b/addons/point_of_sale/wizard/pos_details.xml
@@ -29,7 +29,6 @@
formformnew
- {'record_id' : active_id}
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 8e25f3f0797..f59d814522c 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -43,7 +43,8 @@ class pos_make_payment(osv.osv_memory):
@return: A dictionary which of fields with values.
"""
res = super(pos_make_payment, self).default_get(cr, uid, fields, context=context)
- record_id = context and context.get('active_id',False)
+
+ active_id = context and context.get('active_id',False)
j_obj = self.pool.get('account.journal')
company_id = self.pool.get('res.users').browse(cr,uid,uid).company_id.id
journal = j_obj.search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
@@ -55,14 +56,14 @@ class pos_make_payment(osv.osv_memory):
wf_service = netsvc.LocalService("workflow")
order_obj=self.pool.get('pos.order')
- order = order_obj.browse(cr, uid, record_id, context)
+ order = order_obj.browse(cr, uid, active_id, context)
#get amount to pay
amount = order.amount_total - order.amount_paid
if amount <= 0.0:
context.update({'flag': True})
- order_obj.action_paid(cr, uid, [record_id], context)
+ order_obj.action_paid(cr, uid, [active_id], context)
elif order.amount_paid > 0.0:
- order_obj.write(cr, uid, [record_id], {'state': 'advance'})
+ order_obj.write(cr, uid, [active_id], {'state': 'advance'})
invoice_wanted_checked = False
current_date = time.strftime('%Y-%m-%d')
@@ -81,11 +82,11 @@ class pos_make_payment(osv.osv_memory):
def view_init(self, cr, uid, fields_list, context=None):
res = super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
- record_id = context and context.get('active_id', False) or False
- order = self.pool.get('pos.order').browse(cr, uid, record_id)
+ active_id = context and context.get('active_id', False) or False
+ order = self.pool.get('pos.order').browse(cr, uid, active_id)
if not order.lines:
- raise osv.except_osv('Error!','No order lines defined for this sale ')
- True
+ raise osv.except_osv('Error!','No order lines defined for this sale ')
+ return True
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
"""
@@ -99,22 +100,26 @@ class pos_make_payment(osv.osv_memory):
@return: New arch of view.
"""
- record_id = context and context.get('record_id', False) or False
- res = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
- if record_id:
- order = self.pool.get('pos.order').browse(cr, uid, record_id)
- amount = order.amount_total - order.amount_paid
- if amount==0.0:
- res['arch'] = """
-
-
-
-
-
-
-
- """
- return res
+
+
+ result = super(pos_make_payment, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+ active_model = context.get('active_model')
+ active_id = context.get('active_id', False)
+ if not active_id or (active_model and active_model != 'pos.order'):
+ return result
+
+ order = self.pool.get('pos.order').browse(cr, uid, active_id)
+ if order.amount_total == order.amount_paid:
+ res['arch'] = """
+
+
+
+
+
+
+
+ """
+ return result
def check(self, cr, uid, ids, context=None):
@@ -122,47 +127,48 @@ class pos_make_payment(osv.osv_memory):
if the order is not paid: continue payment,
if the order is paid print invoice (if wanted) or ticket.
"""
- record_id = context and context.get('active_id',False)
+ active_id = context and context.get('active_id',False)
order_obj = self.pool.get('pos.order')
jrnl_obj = self.pool.get('account.journal')
- order = order_obj.browse(cr, uid, record_id, context)
+ order = order_obj.browse(cr, uid, active_id, context)
amount = order.amount_total - order.amount_paid
data = self.read(cr, uid, ids)[0]
-
+
# Todo need to check ...
if amount !=0.0:
invoice_wanted = data['invoice_wanted']
jrnl_used=False
if data.get('journal',False):
jrnl_used=jrnl_obj.browse(cr,uid,data['journal'])
- order_obj.write(cr, uid, [record_id], {'invoice_wanted': invoice_wanted})
- order_obj.add_payment(cr, uid, record_id, data, context=context)
+ order_obj.write(cr, uid, [active_id], {'invoice_wanted': invoice_wanted})
+ order_obj.add_payment(cr, uid, active_id, data, context=context)
# Todo need to check
# if amount<=0.0:
# context.update({'flag':True})
-# order_obj.action_paid(cr,uid,[record_id],context)
- if order_obj.test_paid(cr, uid, [record_id]):
+# order_obj.action_paid(cr,uid,[active_id],context)
+ if order_obj.test_paid(cr, uid, [active_id]):
if order.partner_id and order.invoice_wanted:
return self.create_invoice(cr,uid,ids,context)
else:
- order_obj.action_paid(cr,uid,[record_id],context)
- order_obj.write(cr, uid, [record_id],{'state':'paid'})
+ context.update({'flag': True})
+ order_obj.action_paid(cr,uid,[active_id],context)
+ order_obj.write(cr, uid, [active_id],{'state':'paid'})
return self.print_report(cr, uid, ids, context)
if order.amount_paid > 0.0:
context.update({'flag': True})
# Todo need to check
- order_obj.action_paid(cr, uid, [record_id], context)
- self.pool.get('pos.order').write(cr, uid, [record_id],{'state':'advance'})
+ order_obj.action_paid(cr, uid, [active_id], context)
+ self.pool.get('pos.order').write(cr, uid, [active_id],{'state':'advance'})
return self.print_report(cr, uid, ids, context)
return {}
def create_invoice(self, cr, uid, ids, context):
wf_service = netsvc.LocalService("workflow")
- record_ids = context and context.get('active_ids',False)
- for i in record_ids:
+ active_ids = [context and context.get('active_id',False)]
+ for i in active_ids:
wf_service.trg_validate(uid, 'pos.order', i, 'invoice', cr)
- datas = {'ids' : context.get('active_ids', [])}
+ datas = {'ids' : context.get('active_id', [])}
return {
'type' : 'ir.actions.report.xml',
'report_name':'pos.invoice',
@@ -180,7 +186,8 @@ class pos_make_payment(osv.osv_memory):
@param context: A standard dictionary
@return : retrun report
"""
- datas = {'ids' : context.get('active_ids',[])}
+ active_id=context.get('active_id',[])
+ datas = {'ids' : [active_id]}
res = {}
datas['form'] = res
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
new file mode 100644
index 00000000000..bdb6f46e71e
--- /dev/null
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -0,0 +1,351 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import netsvc
+from osv import osv,fields
+from tools.translate import _
+from mx import DateTime
+import time
+import pos_box_entries
+import pos_add_product
+import pos_payment
+
+class pos_return(osv.osv_memory):
+ _name = 'pos.return'
+ _description = 'Point of sale return'
+
+ _columns = {
+
+ }
+
+ 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.
+
+ """
+
+ res = super(pos_return, self).default_get(cr, uid, fields, context=context)
+ order_obj = self.pool.get('pos.order')
+ active_ids = context.get('active_ids')
+ if not context:
+ context={}
+ for order in order_obj.browse(cr, uid, active_ids):
+ for line in order.lines:
+ if 'return%s'%(line.id) in fields:
+ res['return%s'%(line.id)] = line.qty
+ return res
+
+ def view_init(self, cr, uid, fields_list, context=None):
+ res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
+ order_obj=self.pool.get('pos.order')
+ if not context:
+ context={}
+
+ active_ids=context.get('active_ids')
+ for order in order_obj.browse(cr, uid, active_ids):
+ for line in order.lines:
+ if 'return%s'%(line.id) not in self._columns:
+ self._columns['return%s'%(line.id)] = fields.float("Quantity")
+
+ return res
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False,submenu=False):
+ result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
+ if not context:
+ context={}
+ active_model = context.get('active_model')
+ if not active_model and active_model != 'pos.order':
+ return result
+ order_obj = self.pool.get('pos.order')
+ active_id = context.get('active_id', False)
+ if active_id:
+ _moves_arch_lst="""
+
' % _('Return lines'), '' % _('Quantities you enter, match to products that will return to the stock.')]
- for m in [line for line in order.lines]:
- quantity=m.qty
- arch_lst.append('\n' % (m.id,))
- fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':quantity}
- res.setdefault('returns', []).append(m.id)
- arch_lst.append('
')
- arch.string='\n'.join(arch_lst)
- return res
-
-def _create_returns(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- order_obj = pool.get('pos.order')
- lines_obj = pool.get('pos.order.line')
- picking_obj = pool.get('stock.picking')
- stock_move_obj = pool.get('stock.move')
- move_obj = pool.get('stock.move')
- picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
- clone_list = []
- date_cur=time.strftime('%Y-%m-%d')
- uom_obj = pool.get('product.uom')
- wf_service = netsvc.LocalService("workflow")
- for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
- prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
- val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
- cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
- res=cr.fetchone()
- location_id=res and res[0] or None
- stock_dest_id = int(val.split(',')[1])
-
- order_obj.write(cr,uid,[order_id.id],{'type_rec':'Exchange'})
- if order_id.invoice_id:
- pool.get('account.invoice').refund(cr, uid, [order_id.invoice_id.id],time.strftime('%Y-%m-%d'), False, order_id.name)
- new_picking=picking_obj.create(cr,uid,{
- 'name':'%s (return)' %order_id.name,
- 'move_lines':[], 'state':'draft',
- 'type':'in',
- 'date':date_cur, })
- for line in order_id.lines:
- for r in data['form'].get('returns',[]):
- if line.id==r and (data['form']['return%s' %r]!=0.0):
- new_move=stock_move_obj.create(cr, uid,{
- 'product_qty': data['form']['return%s' %r],
- 'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
- 'picking_id':new_picking,
- 'product_uom':line.product_id.uom_id.id,
- 'location_id':location_id,
- 'product_id':line.product_id.id,
- 'location_dest_id':stock_dest_id,
- 'name':'%s (return)' %order_id.name,
- 'date':date_cur,
- 'date_planned':date_cur,})
- lines_obj.write(cr,uid,[line.id],{'qty_rfd':(line.qty or 0.0) + data['form']['return%s' %r],
- 'qty':line.qty-(data['form']['return%s' %r] or 0.0)
- })
- wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
- picking_obj.force_assign(cr, uid, [new_picking], context)
- return res
-
-def _create_returns2(self, cr, uid, data, context):
- act={}
- pool = pooler.get_pool(cr.dbname)
- order_obj = pool.get('pos.order')
- line_obj = pool.get('pos.order.line')
- picking_obj = pool.get('stock.picking')
- stock_move_obj = pool.get('stock.move')
- picking_ids = picking_obj.search(cr, uid, [('pos_order', 'in', data['ids']), ('state', '=', 'done')])
- clone_list = []
- date_cur=time.strftime('%Y-%m-%d')
- uom_obj = pool.get('product.uom')
- wf_service = netsvc.LocalService("workflow")
- for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
- prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
- val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
- cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
- res=cr.fetchone()
- location_id=res and res[0] or None
- stock_dest_id = int(val.split(',')[1])
- if order_id.last_out_picking.id:
- new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
- 'move_lines':[], 'state':'draft', 'type':'in',
- 'type':'in',
- 'date':date_cur, })
- new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
- 'lines':[],
- 'statement_ids':[],
- 'last_out_picking':[]})
- for line in order_id.lines:
- for r in data['form'].get('returns',[]):
- if line.id==r and (data['form']['return%s' %r]!=0.0):
- new_move=stock_move_obj.create(cr, uid,{
- 'product_qty': data['form']['return%s' %r],
- 'product_uos_qty': uom_obj._compute_qty(cr, uid,data['form']['return%s' %r] ,line.product_id.uom_id.id),
- 'picking_id':new_picking,
- 'product_uom':line.product_id.uom_id.id,
- 'location_id':location_id,
- 'product_id':line.product_id.id,
- 'location_dest_id':stock_dest_id,
- 'name':'%s (return)' %order_id.name,
- 'date':date_cur,
- 'date_planned':date_cur,})
- line_obj.copy(cr,uid,line.id,{'qty':-data['form']['return%s' %r],
- 'order_id': new_order,
- })
- order_obj.write(cr,uid, new_order, {'state':'done'})
- wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
- picking_obj.force_assign(cr, uid, [new_picking], context)
- act = {
- 'domain': "[('id', 'in', ["+str(new_order)+"])]",
- 'name': 'Refunded Orders',
- 'view_type': 'form',
- 'view_mode': 'form,tree',
- 'res_model': 'pos.order',
- 'auto_refresh':0,
- 'res_id':new_order,
- 'view_id': False,
- 'type': 'ir.actions.act_window'
- }
- else:
- raise wizard.except_wizard(_('Error'), _('Last out picking No find!'))
-
- return act
-def test(self,cr,uid,data,context={}):
- # import pdb; pdb.set_trace()
- data['id']=data['res_id']
- return {'id':data['res_id']}
-
-#def _raise(self,cr,uid,data,context={}):
-# return datas
-# raise wizard.except_wizard(_('Message'),_('You can not exchange products more than total paid amount.'))
-
-
-#def _test_exist1(self,cr,uid,data,context={}):
-# return 'choice'
-
-def _test_exist(self,cr,uid,data,context={}):
-# order_obj= pooler.get_pool(cr.dbname).get('pos.order')
-# order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
-# obj=order_obj.browse(cr,uid, data['ids'])[0]
-# am_tot=obj._amount_total(cr, uid, data['ids'])
-# order_obj.write(cr,uid,data['ids'],{'state':'done'})
-# if obj.amount_total == obj.amount_paid:
-# return 'receipt'
-# elif obj.amount_total > obj.amount_paid:
-# sql = """select max(id) from pos_order_line where order_id = %d """%(obj.id)
-# cr.execute(sql)
-# res = cr.fetchone()
-# cr.execute("delete from pos_order_line where id = %d"%(res[0]))
-# cr.commit()
-# return 'choice_raise'
-# else:
- return 'add_p'
-
-def _close(self,cr,uid,data,context={}):
- order_obj= pooler.get_pool(cr.dbname).get('pos.order')
- order_line_obj= pooler.get_pool(cr.dbname).get('pos.order.line')
- obj=order_obj.browse(cr,uid, data['ids'])[0]
- order_obj.write(cr,uid,data['ids'],{'state':'done'})
- if obj.amount_total != obj.amount_paid:
- return 'ask_pay'
- else :
- return 'receipt'
-
-
-
-
-def _add_pdct(self, cr, uid, data, context):
- pool = pooler.get_pool(cr.dbname)
- order_obj = pool.get('pos.order')
- line_obj = pool.get('pos.order.line')
- picking_obj = pool.get('stock.picking')
- wf_service = netsvc.LocalService("workflow")
- prod_obj = pool.get('product.product')
- stock_move_obj = pool.get('stock.move')
- uom_obj = pool.get('product.uom')
- date_cur=time.strftime('%Y-%m-%d')
- order_obj.add_product(cr, uid, data['id'], data['form']['product'],
- data['form']['quantity'], context=context)
- cr.commit()
- for order_id in order_obj.browse(cr, uid, data['ids'], context=context):
- prod=data['form']['product']
- qty=data['form']['quantity']
- prop_ids = pool.get("ir.property").search(cr, uid,[('name', '=', 'property_stock_customer')])
- val = pool.get("ir.property").browse(cr, uid,prop_ids[0]).value
- cr.execute("select s.id from stock_location s, stock_warehouse w where w.lot_stock_id=s.id and w.id= %d "%(order_id.shop_id.warehouse_id.id))
- res=cr.fetchone()
- location_id=res and res[0] or None
- stock_dest_id = int(val.split(',')[1])
-
- prod_id=prod_obj.browse(cr,uid,prod)
- new_picking=picking_obj.create(cr,uid,{
- 'name':'%s (Added)' %order_id.name,
- 'move_lines':[],
- 'state':'draft',
- 'type':'out',
- 'date':date_cur, })
- new_move=stock_move_obj.create(cr, uid,{
- 'product_qty': qty,
- 'product_uos_qty': uom_obj._compute_qty(cr, uid,prod_id.uom_id.id, qty, prod_id.uom_id.id),
- 'picking_id':new_picking,
- 'product_uom':prod_id.uom_id.id,
- 'location_id':location_id,
- 'product_id':prod_id.id,
- 'location_dest_id':stock_dest_id,
- 'name':'%s (return)' %order_id.name,
- 'date':date_cur,
- 'date_planned':date_cur,})
-
- wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
- picking_obj.force_assign(cr, uid, [new_picking], context)
- # order_obj.write(cr,uid,data['id'],{'state':'done','last_out_picking':new_picking})
- order_obj.write(cr,uid,data['id'],{'last_out_picking':new_picking})
- return {}
-
-
-
-
-class wizard_return_picking(wizard.interface):
- states={
- 'init':{
- 'actions':[_get_returns],
- 'result':{'type':'form',
- 'arch':arch,
- 'fields':fields,
- 'state':[('end','Cancel', 'gtk-cancel'),('return','Return goods and Exchange', 'gtk-ok'),('return_w','Return without Refund','gtk-ok')]
- }
- },
- 'return':{
- 'actions':[],
- 'result':{ 'type': 'action',
- 'action' : _create_returns,
- 'state':'prod'}
- },
- 'prod':{
- 'actions':[],
- 'result': {
- 'type': 'form',
- 'arch': _form,
- 'fields':_fields,
- 'state': [('close','Close'),('choice','Continue')]
- }
- },
-# 'choice1' : {
-# 'actions' : [_add_pdct],
-# 'result' : {'type' : 'choice', 'next_state': _test_exist1 }
-# },
- 'choice' : {
- 'actions' : [],
- 'result' : {'type' : 'choice', 'next_state': _test_exist }
- },
-# 'choice_raise':{
-# 'actions':[],
-# 'result':{ 'type': 'action',
-# 'action' : _raise,
-# 'state':'end'}
-# },
- 'add_p' :{
- 'actions':[],
- 'result':{
- 'type':'action',
- 'action': _add_pdct,
- 'state': 'prod'}
- },
-# 'add_pp' :{
-# 'actions':[],
-# 'result':{
-# 'type':'action',
-# 'action': _add_pdct,
-# 'state': 'end'}
-# },
- 'receipt':{
- 'result': {
- 'type': 'print',
- 'report': 'pos.receipt',
- 'state': 'end'
- }
- },
- 'return_w':{
- 'actions':[],
- 'result':{'type':'action', 'action':_create_returns2, 'state':'end'}
- },
-
- 'close':{
- 'actions' : [],
- 'result' : {'type' : 'choice', 'next_state': _close }
- },
-
- 'check': {
- 'actions': [],
- 'result': {
- 'type': 'choice',
- 'next_state': _check,
- }
- },
-
- 'ask_pay': {
- 'actions': [_pre_init],
- 'result': {
- 'type': 'form',
- 'arch': payment_form,
- 'fields': payment_fields,
- 'state': (('end', 'Cancel'), ('add_pay', 'Ma_ke payment', 'gtk-ok', True)
- )
- }
- },
- 'add_pay': {
- 'actions': [_add_pay],
- 'result': {
- 'type': 'state',
- 'state': "check",
- }
- },
-
-
- 'invoice': {
- 'actions': [create_invoice],
- 'result': {
- 'type': 'print',
- 'report': 'pos.invoice',
- 'state': 'end'
- }
- },
- 'receipt': {
- 'actions': [],
- 'result': {
- 'type': 'print',
- 'report': 'pos.receipt',
- 'state': 'end'
- }
- },
- 'paid': {
- 'actions': [],
- 'result': {
- 'type': 'state',
- 'state': 'end'
- }
- },
-
- }
-wizard_return_picking('pos.return.picking')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 4128e992c82..b3e18ced10a 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -49,13 +49,13 @@
'update_xml': [
'security/product_security.xml',
'security/ir.model.access.csv',
+ 'wizard/product_price_view.xml',
'product_data.xml',
'product_report.xml',
'product_view.xml',
'pricelist_view.xml',
'partner_view.xml',
'company_view.xml',
- 'product_wizard.xml',
'process/product_process.xml'
],
'installable': True,
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index bb924db644c..62e52d410d2 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-27 08:20+0000\n"
-"Last-Translator: Oktay Altunergil \n"
+"PO-Revision-Date: 2010-05-10 16:32+0000\n"
+"Last-Translator: Angel Spy \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: 2010-04-17 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-05-11 04:19+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
@@ -90,7 +90,7 @@ msgstr ""
#. module: product
#: field:product.packaging,width:0
msgid "Width"
-msgstr "En/Genişlik"
+msgstr "Genişlik"
#. module: product
#: help:product.pricelist.item,product_tmpl_id:0
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 66e4ba84c37..6b756eb8d7f 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/addons/product/product_wizard.xml b/addons/product/product_wizard.xml
deleted file mode 100644
index f226cd4e543..00000000000
--- a/addons/product/product_wizard.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/addons/product/wizard/__init__.py b/addons/product/wizard/__init__.py
index fed1bcf3783..47f5f2641fc 100644
--- a/addons/product/wizard/__init__.py
+++ b/addons/product/wizard/__init__.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-import wizard_price
+import product_price
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
new file mode 100644
index 00000000000..e5d73945c13
--- /dev/null
+++ b/addons/product/wizard/product_price.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import osv, fields
+from tools.translate import _
+
+
+class product_price_list(osv.osv_memory):
+ _name = 'product.price_list'
+ _description = 'Product Price List'
+
+ _columns = {
+ 'price_list': fields.many2one('product.pricelist', 'PriceList', required=True),
+ 'qty1': fields.integer('Quantity-1'),
+ 'qty2': fields.integer('Quantity-2'),
+ 'qty3': fields.integer('Quantity-3'),
+ 'qty4': fields.integer('Quantity-4'),
+ 'qty5': fields.integer('Quantity-5'),
+ }
+ _defaults = {
+ 'qty1': lambda *a: 0,
+ 'qty2': lambda *a: 0,
+ 'qty3': lambda *a: 0,
+ 'qty4': lambda *a: 0,
+ 'qty5': lambda *a: 0,
+ }
+
+ def print_report(self, cr, uid, ids, context=None):
+
+ """
+ To get the date and print the report
+ @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 : return report
+ """
+ datas = {'ids': context.get('active_ids', [])}
+ res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context)
+ res = res and res[0] or {}
+ datas['form'] = res
+ return {
+ 'type': 'ir.actions.report.xml',
+ 'report_name': 'product.pricelist',
+ 'datas': datas,
+ }
+product_price_list()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product/wizard/product_price_view.xml b/addons/product/wizard/product_price_view.xml
new file mode 100644
index 00000000000..17d9010ed43
--- /dev/null
+++ b/addons/product/wizard/product_price_view.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ Price List
+ product.price_list
+ form
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/product/wizard/wizard_price.py b/addons/product/wizard/wizard_price.py
deleted file mode 100644
index 12c810b802d..00000000000
--- a/addons/product/wizard/wizard_price.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
-#
-# 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 .
-#
-##############################################################################
-
-import wizard
-
-qty1_form = '''
-
-
-
-
-
-
-
-
-
'''
-qty1_fields = {
- 'price_list' : {'string' : 'PriceList', 'type' : 'many2one', 'relation' : 'product.pricelist', 'required':True },
- 'qty1': {'string':'Quantity-1', 'type':'integer', 'default':0},
- 'qty2': {'string':'Quantity-2', 'type':'integer', 'default':0},
- 'qty3': {'string':'Quantity-3', 'type':'integer', 'default':0},
- 'qty4': {'string':'Quantity-4', 'type':'integer', 'default':0},
- 'qty5': {'string':'Quantity-5', 'type':'integer', 'default':0},
-}
-
-
-class wizard_qty(wizard.interface):
-
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':qty1_form, 'fields':qty1_fields, 'state':[('end','Cancel'),('price','Print')]}
- },
- 'price': {
- 'actions': [],
- 'result': {'type':'print', 'report':'product.pricelist', 'state':'end'}
- }
-
- }
-wizard_qty('product.price_list')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/project/project.py b/addons/project/project.py
index 727f210a488..c347d9eb736 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -258,16 +258,17 @@ class task(osv.osv):
(task.description or '')+'\n\n'
# Compute: effective_hours, total_hours, progress
- def _hours_get(self, cr, uid, ids, field_names, args, context):
+ def _hours_get(self, cr, uid, ids, field_names, args, context=None):
+ res = {}
cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id =ANY(%s) GROUP BY task_id",(ids,))
hours = dict(cr.fetchall())
- res = {}
for task in self.browse(cr, uid, ids, context=context):
- res[task.id] = {}
- res[task.id]['effective_hours'] = hours.get(task.id, 0.0)
- res[task.id]['total_hours'] = task.remaining_hours + hours.get(task.id, 0.0)
+ res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
if (task.remaining_hours + hours.get(task.id, 0.0)):
- res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 100),2)
+ if hours.get(task.id, 0.0) > res[task.id]['total_hours']:
+ res[task.id]['progress'] = round(100 - (max(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 100)) % 100, 2)
+ else:
+ res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 100),2)
else:
res[task.id]['progress'] = 0.0
if task.state in ('done','cancel'):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6a74161b250..199d2e1bd01 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -337,7 +337,7 @@
-
+
diff --git a/addons/project_long_term/wizard/project_compute_phases_view.xml b/addons/project_long_term/wizard/project_compute_phases_view.xml
index 900112ba409..4b4e01a72a9 100644
--- a/addons/project_long_term/wizard/project_compute_phases_view.xml
+++ b/addons/project_long_term/wizard/project_compute_phases_view.xml
@@ -13,6 +13,7 @@
+
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 12e6f167304..6302bb7b440 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -111,8 +111,8 @@
-
-
+
+
diff --git a/addons/purchase/__init__.py b/addons/purchase/__init__.py
index 41c673c0104..301e32ebca9 100644
--- a/addons/purchase/__init__.py
+++ b/addons/purchase/__init__.py
@@ -25,6 +25,7 @@ import stock
import wizard
import report
import stock
+import company
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 6687b330b2c..909b785fe72 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -31,7 +31,7 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['base', 'account', 'stock', 'process'],
+ 'depends': ['base', 'account', 'stock', 'process', 'mrp_procurement'],
'init_xml': [],
'update_xml': [
@@ -39,6 +39,7 @@
'security/ir.model.access.csv',
'purchase_workflow.xml',
'purchase_sequence.xml',
+ 'company_view.xml',
'purchase_data.xml',
'wizard/purchase_order_group_view.xml',
'wizard/purchase_installer.xml',
diff --git a/addons/purchase/company.py b/addons/purchase/company.py
new file mode 100644
index 00000000000..2a01605782c
--- /dev/null
+++ b/addons/purchase/company.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import osv,fields
+
+class company(osv.osv):
+ _inherit = 'res.company'
+ _columns = {
+ 'po_lead': fields.float('Purchase Lead Time', required=True,
+ help="This is the leads/security time for each purchase order."),
+ }
+ _defaults = {
+ 'po_lead': lambda *a: 1.0,
+ }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
new file mode 100644
index 00000000000..d7707fe32c7
--- /dev/null
+++ b/addons/purchase/company_view.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ res.company.mrp.config
+ res.company
+ form
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2bcc62c06ac..a7d69159873 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -19,6 +19,7 @@
#
##############################################################################
+from mx import DateTime
from osv import fields
from osv import osv
import time
@@ -692,5 +693,86 @@ class purchase_order_line(osv.osv):
return True
purchase_order_line()
+class mrp_procurement(osv.osv):
+ _inherit = 'mrp.procurement'
+ _columns = {
+ 'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
+ }
+
+ def action_po_assign(self, cr, uid, ids, context={}):
+ """ This is action which call from workflow to assign purchase order to procurements
+ @return: True
+ """
+ res = self.make_po(cr, uid, ids, context=context)
+ res = res.values()
+ return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
+
+ def make_po(self, cr, uid, ids, context={}):
+ """ Make purchase order from procurement
+ @return: New created Purchase Orders procurement wise
+ """
+ res = {}
+ company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+ partner_obj = self.pool.get('res.partner')
+ uom_obj = self.pool.get('product.uom')
+ pricelist_obj = self.pool.get('product.pricelist')
+ prod_obj = self.pool.get('product.product')
+ acc_pos_obj = self.pool.get('account.fiscal.position')
+ po_obj = self.pool.get('purchase.order')
+ for procurement in self.browse(cr, uid, ids):
+ res_id = procurement.move_id.id
+ partner = procurement.product_id.seller_ids[0].name
+ partner_id = partner.id
+ address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
+ pricelist_id = partner.property_product_pricelist_purchase.id
+
+ uom_id = procurement.product_id.uom_po_id.id
+
+ qty = uom_obj._compute_qty(cr, uid, procurement.product_uom.id, procurement.product_qty, uom_id)
+ if procurement.product_id.seller_ids[0].qty:
+ qty = max(qty,procurement.product_id.seller_ids[0].qty)
+
+ price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
+
+ newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
+ newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
+ newdate = newdate - procurement.product_id.seller_ids[0].delay
+
+ #Passing partner_id to context for purchase order line integrity of Line name
+ context.update({'lang': partner.lang, 'partner_id': partner_id})
+
+ product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+
+ line = {
+ 'name': product.partner_ref,
+ 'product_qty': qty,
+ 'product_id': procurement.product_id.id,
+ 'product_uom': uom_id,
+ 'price_unit': price,
+ 'date_planned': newdate.strftime('%Y-%m-%d %H:%M:%S'),
+ 'move_dest_id': res_id,
+ 'notes': product.description_purchase,
+ }
+
+ taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
+ taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
+ line.update({
+ 'taxes_id': [(6,0,taxes)]
+ })
+ purchase_id = po_obj.create(cr, uid, {
+ 'origin': procurement.origin,
+ 'partner_id': partner_id,
+ 'partner_address_id': address_id,
+ 'location_id': procurement.location_id.id,
+ 'pricelist_id': pricelist_id,
+ 'order_line': [(0,0,line)],
+ 'company_id': procurement.company_id.id,
+ 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
+ })
+ res[procurement.id] = purchase_id
+ self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': purchase_id})
+ return res
+mrp_procurement()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c301116db2a..fe6fa0a5e80 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -322,7 +322,22 @@
-
+
+
+
+
+ mrp.procurement.form.inherit
+ mrp.procurement
+
+ form
+
+
+
+
+
+
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 26f83d5a554..d7684be1875 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -177,6 +177,33 @@
+
+
+
+
+ buy
+ subflow
+
+ action_po_assign()
+
+
+
+
+
+ check_buy()
+
+
+
+
+
+ subflow.delivery_done
+
+
+
+
+
+ subflow.cancel
+
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 8e4b4bc194c..14ff085a4c4 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -122,7 +122,7 @@ class purchase_order(osv.osv):
if order.id<>po.id:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'purchase.order', order.id, 'purchase_cancel', cr)
- self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'close','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
+ self.pool.get('purchase.requisition').write(cr, uid, [po.requisition_id.id], {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')})
return res
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 38ba539c912..4632931bcd1 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -151,7 +151,7 @@ class resource_resource(osv.osv):
'name' : fields.char("Name", size=64, required=True ),
'code': fields.char('Code', size=16),
'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the resource record without removing it."),
- 'company_id' : fields.many2one('res.company', 'Company', required=True),
+ 'company_id' : fields.many2one('res.company', 'Company', required=False),
'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 4fbcdd1c284..f7bfbf9f00f 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -203,6 +203,7 @@
+
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index ebc12a1089e..71f33623c55 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -26,9 +26,10 @@
import sale
import stock
import product
-import mrp
+#import mrp
import wizard
import report
+import company
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index a6ff79b38cd..23e72c60775 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -42,13 +42,14 @@
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
- 'depends': ['product', 'stock', 'mrp', 'process'],
+ 'depends': ['product', 'stock', 'mrp_procurement', 'process'],
'init_xml': [],
'update_xml': [
'wizard/sale_make_invoice_advance.xml',
'wizard/sale_line_invoice.xml',
'security/sale_security.xml',
'security/ir.model.access.csv',
+ 'company_view.xml',
'sale_workflow.xml',
'sale_sequence.xml',
'sale_data.xml',
@@ -56,7 +57,7 @@
'report/sale_report_view.xml',
'sale_report.xml',
'stock_view.xml',
- 'process/sale_process.xml',
+# 'process/sale_process.xml',
],
'demo_xml': ['sale_demo.xml'],
'installable': True,
diff --git a/addons/sale/company.py b/addons/sale/company.py
new file mode 100644
index 00000000000..401a1a9c1d8
--- /dev/null
+++ b/addons/sale/company.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# 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 .
+#
+##############################################################################
+
+from osv import osv,fields
+
+class company(osv.osv):
+ _inherit = 'res.company'
+ _columns = {
+ 'security_lead': fields.float('Security Days', required=True,
+ help="This is the days added to what you promise to customers "\
+ "for security purpose"),
+ }
+ _defaults = {
+ 'security_lead': lambda *a: 5.0,
+ }
+company()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
new file mode 100644
index 00000000000..ead9128d6f3
--- /dev/null
+++ b/addons/sale/company_view.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ res.company.mrp.config
+ res.company
+ form
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 5da1a96f8d4..58e4be14d84 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -35,7 +35,7 @@
-
+
@@ -63,12 +63,12 @@
-
-
+
+
-
+
@@ -202,7 +202,7 @@
-
+
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 259b5d75e39..d6ab6a7bc0c 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -1,6 +1,16 @@
+
+
+
+
+
+
+
+
+
@@ -188,7 +188,7 @@
-
+
@@ -395,9 +395,9 @@
icon="gtk-cancel" />
-
-
-
+
+
+
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 44ce9f7d1fa..7af8c1e74a7 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -11,10 +11,7 @@
"access_account_analytic_account_salesman","account_analytic_account salesman","analytic.model_account_analytic_account","group_sale_user",1,1,1,1
"access_stock_picking_salesman","stock_picking salesman","stock.model_stock_picking","group_sale_user",1,1,1,1
"access_stock_move_salesman","stock_move salesman","stock.model_stock_move","group_sale_user",1,1,1,0
-"access_mrp_property_salesman","mrp.property salesman","mrp.model_mrp_property","group_sale_user",1,0,0,0
-"access_mrp_procurement_salesman","mrp.procurement salesman","mrp.model_mrp_procurement","group_sale_user",1,1,1,1
-"access_sale_order_mrp_user","sale.order mrp worker","model_sale_order","mrp.group_mrp_user",1,0,0,0
-"access_sale_order_line_mrp_user","sale.order.line mrp worker","model_sale_order_line","mrp.group_mrp_user",1,0,0,0
+"access_mrp_procurement_salesman","mrp.procurement salesman","mrp_procurement.model_mrp_procurement","group_sale_user",1,1,1,1
"access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0
"access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0
"access_sale_order_manager","sale.order.manager","model_sale_order","group_sale_manager",1,1,1,1
diff --git a/addons/scrum/__openerp__.py b/addons/scrum/__openerp__.py
index 19facdbaed3..3170baca2a1 100644
--- a/addons/scrum/__openerp__.py
+++ b/addons/scrum/__openerp__.py
@@ -56,6 +56,7 @@
'scrum_view.xml',
'process/scrum_process.xml',
'wizard/scrum_backlog_sprint_view.xml',
+ 'wizard/scrum_backlog_merger_view.xml',
],
'demo_xml': ['scrum_demo.xml'],
'installable': True,
diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py
index 915332f7f7d..f0d54156d75 100644
--- a/addons/scrum/scrum.py
+++ b/addons/scrum/scrum.py
@@ -18,11 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
-
import time
import netsvc
-from osv import fields, osv, orm
+from osv import fields, osv, orm
from mx import DateTime
import re
@@ -35,8 +34,8 @@ class scrum_project(osv.osv):
}
_defaults = {
'product_owner_id': lambda self,cr,uid,context={}: uid,
- 'sprint_size': lambda *a: 15,
- 'scrum': lambda *a: 1
+ 'sprint_size': 15,
+ 'scrum': 1
}
scrum_project()
@@ -93,25 +92,50 @@ class scrum_sprint(osv.osv):
return True
_columns = {
'name' : fields.char('Sprint Name', required=True, size=64),
+ 'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to select sprint from task list view. "),
'date_start': fields.date('Starting Date', required=True),
'date_stop': fields.date('Ending Date', required=True),
- 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)]),
+ 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
'product_owner_id': fields.many2one('res.users', 'Product Owner', required=True),
'scrum_master_id': fields.many2one('res.users', 'Scrum Master', required=True),
'meeting_ids': fields.one2many('scrum.meeting', 'sprint_id', 'Daily Scrum'),
'review': fields.text('Sprint Review'),
'retrospective': fields.text('Sprint Retrospective'),
'backlog_ids': fields.one2many('scrum.product.backlog', 'sprint_id', 'Sprint Backlog'),
- 'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)'),
- 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
- 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
- 'expected_hours': fields.function(_calc_expected, method=True, string='Expected Hours'),
+ 'progress': fields.function(_calc_progress, method=True, string='Progress (0-100)', help="Computed as: Time Spent / Total Time."),
+ 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done."),
+ 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+ 'expected_hours': fields.function(_calc_expected, method=True, string='Expected Hours', help='Estimated time to do the task.'),
'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('cancel','Cancelled'),('done','Done')], 'State', required=True),
}
_defaults = {
- 'state': lambda *a: 'draft',
- 'date_start' : lambda *a:time.strftime('%Y-%m-%d'),
+ 'state': 'draft',
+ 'date_start' : time.strftime('%Y-%m-%d'),
+ 'active': 1,
}
+
+ def copy(self, cr, uid, id, default=None, context=None):
+ """Overrides orm copy method
+ @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 case’s IDs
+ @param context: A standard dictionary for contextual values
+ """
+ if context is None:
+ context = {}
+ if default is None:
+ default = {}
+ data = self.read(cr, uid, id, context=context)
+ data.pop('backlog_ids')
+ data.pop('meeting_ids')
+ data.update({'scrum_master_id': data['scrum_master_id'][0],
+ 'product_owner_id': data['product_owner_id'][0],
+ 'project_id': data['project_id'][0],
+ })
+ return self.create(cr, uid, data, context=context)
+
+
def onchange_project_id(self, cr, uid, ids, project_id):
v = {}
if project_id:
@@ -178,6 +202,8 @@ class scrum_product_backlog(osv.osv):
return True
def button_close(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'done'}, context=context)
+ for backlog in self.browse(cr, uid, ids, context=context):
+ self.pool.get('project.task').write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'done'})
return True
def button_pending(self, cr, uid, ids, context={}):
self.write(cr, uid, ids, {'state':'pending'}, context=context)
@@ -186,23 +212,23 @@ class scrum_product_backlog(osv.osv):
_columns = {
'name' : fields.char('Feature', size=64, required=True),
'note' : fields.text('Note'),
- 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the product backlog without removing it."),
- 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)]),
+ 'active' : fields.boolean('Active', help="If Active field is set to true, it will allow you to hide the product backlog without removing it."),
+ 'project_id': fields.many2one('project.project', 'Project', required=True, domain=[('scrum','=',1)], help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
'user_id': fields.many2one('res.users', 'Responsible'),
'sprint_id': fields.many2one('scrum.sprint', 'Sprint'),
'sequence' : fields.integer('Sequence', help="Gives the sequence order when displaying a list of product backlog."),
'tasks_id': fields.one2many('project.task', 'product_backlog_id', 'Tasks Details'),
'state': fields.selection([('draft','Draft'),('open','Open'),('pending','Pending'),('done','Done'),('cancel','Cancelled')], 'State', required=True),
- 'progress': fields.function(_calc_progress, method=True, string='Progress'),
- 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours'),
- 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours'),
- 'expected_hours': fields.float('Expected Hours'),
+ 'progress': fields.function(_calc_progress, method=True, string='Progress', help="Computed as: Time Spent / Total Time."),
+ 'effective_hours': fields.function(_calc_effective, method=True, string='Effective hours', help="Computed using the sum of the task work done."),
+ 'planned_hours': fields.function(_calc_planned, method=True, string='Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+ 'expected_hours': fields.float('Expected Hours', help='Estimated time to do the task.'),
'date':fields.datetime("Created Date"),
}
_defaults = {
- 'state': lambda *a: 'draft',
- 'active': lambda *a: 1,
- 'user_id': lambda self,cr,uid,context: uid,
+ 'state': 'draft',
+ 'active': 1,
+ 'user_id': lambda self, cr, uid, context: uid,
}
_order = "sequence"
scrum_product_backlog()
@@ -234,8 +260,9 @@ scrum_task()
class scrum_meeting(osv.osv):
_name = 'scrum.meeting'
_description = 'Scrum Meeting'
+ _order = 'date desc'
_columns = {
- 'name' : fields.char('Meeting Name', size=64, required=True),
+ 'name' : fields.char('Meeting Name', size=64),
'date': fields.date('Meeting Date', required=True),
'sprint_id': fields.many2one('scrum.sprint', 'Sprint', required=True),
'project_id': fields.many2one('project.project', 'Project'),
@@ -249,7 +276,7 @@ class scrum_meeting(osv.osv):
# TODO: Find the right sprint thanks to users and date
#
_defaults = {
- 'date' : lambda *a:time.strftime('%Y-%m-%d'),
+ 'date' : time.strftime('%Y-%m-%d'),
}
scrum_meeting()
diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index 41ddb3ff2cd..754d901ad19 100644
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -67,12 +67,13 @@
-
+
+
-
+
@@ -189,8 +190,11 @@
form