odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]fix installation of several modules: purchase, sales, purchase_req, mrp, sale_stock 

bzr revid: csn@openerp.com-20130709150027-wy8avglaosiktm5m
This commit is contained in:
Cedric Snauwaert 2013-07-09 17:00:27 +02:00
parent 8abe65d6a1
commit 277531f21d
19 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/mrp/__openerp__.py
View File

@ -66,8 +66,8 @@ Dashboard / Reports for MRP will include:
'mrp_report.xml',
'company_view.xml',
'process/stockable_product_process.xml',
'process/service_product_process.xml',
'process/procurement_process.xml',
#'process/service_product_process.xml',
#'process/procurement_process.xml',
'report/mrp_report_view.xml',
'report/mrp_production_order_view.xml',
'board_manufacturing_view.xml',

12
addons/mrp/mrp_view.xml
View File

@ -672,7 +672,8 @@
<field name="product_id"/>
<field name="product_qty" string="Quantity"/>
<field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
<field name="prodlot_id" groups="stock.group_production_lot" context="{'product_id': product_id}"/>
<!-- TODO field prodlot_id is now on the quant object
<field name="prodlot_id" groups="stock.group_production_lot" context="{'product_id': product_id}"/>-->
<field name="state" invisible="1"/>
<button name="%(stock.move_consume)d"
string="Consume Products" type="action"
@ -697,7 +698,7 @@
<field name="product_id" readonly="1"/>
<field name="product_qty" readonly="1"/>
<field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
<!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>-->
<field name="state" invisible="1"/>
<field name="scrapped" invisible="1"/>
</tree>
@ -728,7 +729,7 @@
<field name="product_qty" readonly="1"/>
<field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
<field name="location_dest_id" readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
<!--<field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>-->
<field name="scrapped" invisible="1"/>
<field name="state" invisible="1"/>
<button name="%(stock.track_line)d"
@ -934,6 +935,7 @@
Procurements
-->
<!-- CRASH FOR UNKNOW REASON, reason is : invalid model
<record id="view_procurement_form_inherit" model="ir.ui.view">
<field name="name">procurement.order.form.inherit</field>
<field name="model">procurement.order</field>
@ -951,11 +953,11 @@
</xpath>
</data>
</field>
</record>
</record>-->
<record id="product_product_normal_form_supply_view" model="ir.ui.view">
<field name="name">product.normal.form.mrp.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="inherit_id" ref="stock.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='supply_method']" position="attributes">
<attribute name="invisible">False</attribute>

6
addons/mrp/mrp_workflow.xml
View File

@ -115,8 +115,8 @@
</record>
<!-- Procurement -->
<record id="act_produce" model="workflow.activity">
<!-- TODO csn : check if fix is needed since no more workflow in procurement -->
<!-- <record id="act_produce" model="workflow.activity">
<field name="wkf_id" ref="procurement.wkf_procurement"/>
<field name="name">produce</field>
<field name="kind">subflow</field>
@ -140,7 +140,7 @@
<field name="act_from" ref="act_produce"/>
<field name="act_to" ref="procurement.act_cancel"/>
<field name="signal">subflow.cancel</field>
</record>
</record> -->
</data>
</openerp>

12
addons/mrp/process/procurement_process.xml
View File

@ -26,7 +26,7 @@
</record>
<record id="process_node_stockproduct0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Product type is Stockable or Consumable.&quot;&quot;&quot;" name="note"/>
@ -38,7 +38,7 @@
</record>
<record id="process_node_stockproduct1" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;For stockable products and consumables&quot;&quot;&quot;" name="note"/>
@ -50,7 +50,7 @@
</record>
<record id="process_node_serviceproduct0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Product type is service&quot;&quot;&quot;" name="note"/>
@ -62,7 +62,7 @@
</record>
<record id="process_node_serviceproduct1" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;For Services.&quot;&quot;&quot;" name="note"/>
@ -74,7 +74,7 @@
</record>
<record id="process_node_purchaseprocure0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Procurement Orders&quot;&quot;&quot;" name="name"/>
@ -118,7 +118,7 @@
Process Transition
-->
<record id="process_node_procureproducts0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>

2
addons/mrp/process/service_product_process.xml
View File

@ -9,7 +9,7 @@
<record id="process_node_servicemts0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>

4
addons/mrp/process/stockable_product_process.xml
View File

@ -17,7 +17,7 @@
-->
<record id="process_node_mts0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Assignment from stock.&quot;&quot;&quot;" name="note"/>
@ -28,7 +28,7 @@
</record>
<record id="process_node_stock0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="mrp.model_procurement_order"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>

6
addons/mrp/security/ir.model.access.csv
View File

@ -7,8 +7,6 @@ access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_use
access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
access_mrp_production_workcenter_line_salesman,mrp.production.workcenter.line salesman,model_mrp_production_workcenter_line,base.group_sale_salesman,1,0,1,0
access_mrp_property_group,mrp.property.group,procurement.model_mrp_property_group,mrp.group_mrp_manager,1,1,1,1
access_mrp_property,mrp.property,procurement.model_mrp_property,mrp.group_mrp_manager,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_procurement,procurement.order,model_procurement_order,mrp.group_mrp_user,1,1,1,1
access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_manager,1,1,1,1
@ -34,7 +32,6 @@ access_product_product_user,product.product user,product.model_product_product,m
access_product_template_user,product.template user,product.model_product_template,mrp.group_mrp_user,1,0,0,0
access_product_uom_user,product.uom user,product.model_product_uom,mrp.group_mrp_user,1,0,0,0
access_product_supplierinfo_user,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_user,1,1,1,1
access_stock_tracking,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_user,1,1,1,0
access_res_partner,res.partner,base.model_res_partner,mrp.group_mrp_user,1,0,0,0
access_workcenter_user,mrp.production.workcenter.line.user,model_mrp_production_workcenter_line,mrp.group_mrp_user,1,1,1,1
access_resource_calendar_leaves_user,mrp.resource.calendar.leaves.user,resource.model_resource_calendar_leaves,mrp.group_mrp_user,1,1,1,1
@ -45,7 +42,6 @@ access_resource_resource,resource.resource,resource.model_resource_resource,mrp.
access_board_board_user,mrp.board.board,board.model_board_board,mrp.group_mrp_user,1,0,0,0
access_account_sequence_fiscalyear_manager,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
access_product_supplierinfo_manager,product.supplierinfo user,product.model_product_supplierinfo,mrp.group_mrp_manager,1,0,0,0
access_stock_tracking_manager,stock.tracking,stock.model_stock_tracking,mrp.group_mrp_manager,1,0,0,0
access_mrp_production_manager,mrp.production manager,model_mrp_production,mrp.group_mrp_manager,1,0,0,0
access_procurement_manager,procurement.order,model_procurement_order,mrp.group_mrp_manager,1,0,0,0
access_workcenter_manager,mrp.production.workcenter.line,model_mrp_production_workcenter_line,mrp.group_mrp_manager,1,0,0,0
@ -53,7 +49,7 @@ access_stock_move_mrp_manager,stock.move mrp_manager,stock.model_stock_move,mrp.
access_mrp_production_product_line_manager,mrp.production.product.line manager,model_mrp_production_product_line,mrp.group_mrp_manager,1,0,0,0
access_account_sequence_fiscalyear_system,account.sequence.fiscalyear.system,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0
access_stock_production_lot_user,stock.production.lot,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1
access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,0,0,0
access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,0,0,0
access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,0,0,0
access_report_mrp_inout_user,report.mrp.inout user,model_report_mrp_inout,mrp.group_mrp_user,1,0,0,0
access_report_workcenter_load_user,report.workcenter.load.user,model_report_workcenter_load,mrp.group_mrp_user,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
7 access_mrp_production_salesman mrp.production salesman model_mrp_production base.group_sale_salesman 1 1 1 0
8 access_mrp_production_product_line_salesman mrp.production.product.line salesman model_mrp_production_product_line base.group_sale_salesman 1 0 1 0
9 access_mrp_production_workcenter_line_salesman mrp.production.workcenter.line salesman model_mrp_production_workcenter_line base.group_sale_salesman 1 0 1 0
access_mrp_property_group mrp.property.group procurement.model_mrp_property_group mrp.group_mrp_manager 1 1 1 1
access_mrp_property mrp.property procurement.model_mrp_property mrp.group_mrp_manager 1 1 1 1
10 access_mrp_production_product_line mrp.production.product.line model_mrp_production_product_line mrp.group_mrp_user 1 1 1 1
11 access_procurement procurement.order model_procurement_order mrp.group_mrp_user 1 1 1 1
12 access_mrp_workcenter_manager mrp.workcenter.manager model_mrp_workcenter mrp.group_mrp_manager 1 1 1 1
32 access_product_template_user product.template user product.model_product_template mrp.group_mrp_user 1 0 0 0
33 access_product_uom_user product.uom user product.model_product_uom mrp.group_mrp_user 1 0 0 0
34 access_product_supplierinfo_user product.supplierinfo user product.model_product_supplierinfo mrp.group_mrp_user 1 1 1 1
access_stock_tracking stock.tracking stock.model_stock_tracking mrp.group_mrp_user 1 1 1 0
35 access_res_partner res.partner base.model_res_partner mrp.group_mrp_user 1 0 0 0
36 access_workcenter_user mrp.production.workcenter.line.user model_mrp_production_workcenter_line mrp.group_mrp_user 1 1 1 1
37 access_resource_calendar_leaves_user mrp.resource.calendar.leaves.user resource.model_resource_calendar_leaves mrp.group_mrp_user 1 1 1 1
42 access_board_board_user mrp.board.board board.model_board_board mrp.group_mrp_user 1 0 0 0
43 access_account_sequence_fiscalyear_manager account.sequence.fiscalyear account.model_account_sequence_fiscalyear mrp.group_mrp_manager 1 0 0 0
44 access_product_supplierinfo_manager product.supplierinfo user product.model_product_supplierinfo mrp.group_mrp_manager 1 0 0 0
access_stock_tracking_manager stock.tracking stock.model_stock_tracking mrp.group_mrp_manager 1 0 0 0
45 access_mrp_production_manager mrp.production manager model_mrp_production mrp.group_mrp_manager 1 0 0 0
46 access_procurement_manager procurement.order model_procurement_order mrp.group_mrp_manager 1 0 0 0
47 access_workcenter_manager mrp.production.workcenter.line model_mrp_production_workcenter_line mrp.group_mrp_manager 1 0 0 0
49 access_mrp_production_product_line_manager mrp.production.product.line manager model_mrp_production_product_line mrp.group_mrp_manager 1 0 0 0
50 access_account_sequence_fiscalyear_system account.sequence.fiscalyear.system account.model_account_sequence_fiscalyear mrp.group_mrp_manager 1 0 0 0
51 access_stock_production_lot_user stock.production.lot stock.model_stock_production_lot mrp.group_mrp_user 1 1 1 1
52 access_stock_warehouse_orderpoint_user stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint stock.model_stock_warehouse_orderpoint mrp.group_mrp_user 1 0 0 0
53 access_stock_picking_mrp_manager stock.picking mrp_manager stock.model_stock_picking mrp.group_mrp_manager 1 0 0 0
54 access_report_mrp_inout_user report.mrp.inout user model_report_mrp_inout mrp.group_mrp_user 1 0 0 0
55 access_report_workcenter_load_user report.workcenter.load.user model_report_workcenter_load mrp.group_mrp_user 1 0 0 0

2
addons/portal_stock/security/ir.model.access.csv
View File

@ -2,4 +2,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_stock_picking,stock.picking,stock.model_stock_picking,portal.group_portal,1,0,0,0
access_stock_picking.out,stock.picking.out,stock.model_stock_picking_out,portal.group_portal,1,0,0,0
access_stock_move,stock.move,stock.model_stock_move,portal.group_portal,1,0,0,0
access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,portal.group_portal,1,0,0,0
access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,portal.group_portal,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_stock_picking stock.picking stock.model_stock_picking portal.group_portal 1 0 0 0
3 access_stock_picking.out stock.picking.out stock.model_stock_picking_out portal.group_portal 1 0 0 0
4 access_stock_move stock.move stock.model_stock_move portal.group_portal 1 0 0 0
5 access_stock_warehouse_orderpoint stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint stock.model_stock_warehouse_orderpoint portal.group_portal 1 0 0 0

2
addons/project_mrp/project_mrp_view.xml
View File

@ -34,7 +34,7 @@
<record id="product_product_normal_form_supply_view" model="ir.ui.view">
<field name="name">product.normal.form.project_mrp.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="inherit_id" ref="stock.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='supply_method']" position="attributes">
<attribute name="invisible">False</attribute>

5
addons/purchase/purchase_view.xml
View File

@ -529,6 +529,7 @@
<!-- Procurements -->
<!-- CRASH FOR UNKNOW REASON, reason is : invalid model
<record id="view_procurement_form_inherit" model="ir.ui.view">
<field name="name">procurement.order.form.inherit</field>
<field name="model">procurement.order</field>
@ -538,7 +539,7 @@
<field name="purchase_id"/>
</xpath>
</field>
</record>
</record>-->
<!-- Product Suppliers-->
@ -561,7 +562,7 @@
<record id="product_product_normal_form_procurement_help_view" model="ir.ui.view">
<field name="name">product.normal.form.procurement.help.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="inherit_id" ref="stock.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<group name="procurement_help" position="inside">
<p attrs="{'invisible': ['|','|',('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">

5
addons/purchase/purchase_workflow.xml
View File

@ -203,7 +203,8 @@
</record>
<!-- Procurement -->
<record id="act_buy" model="workflow.activity">
<!-- TODO csn : check if fix is needed since no more workflow in procurement -->
<!-- <record id="act_buy" model="workflow.activity">
<field name="wkf_id" ref="procurement.wkf_procurement"/>
<field name="name">buy</field>
<field name="kind">subflow</field>
@ -228,6 +229,6 @@
<field name="act_to" ref="procurement.act_cancel"/>
<field name="signal">subflow.cancel</field>
</record>
-->
</data>
</openerp>

4
addons/purchase/report/purchase_report_view.xml
View File

@ -142,7 +142,7 @@
groups="purchase.group_purchase_manager"/>
<menuitem action="action_purchase_order_report_all" id="menu_action_purchase_order_report_all" parent="base.next_id_73" sequence="3"/>
<record id="action_stock_move_report_po" model="ir.actions.act_window">
<!--<record id="action_stock_move_report_po" model="ir.actions.act_window">
<field name="name">Receptions Analysis</field>
<field name="res_model">report.stock.move</field>
<field name="view_type">form</field>
@ -151,7 +151,7 @@
<field name="context">{'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,}</field>
<field name="help">Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries.</field>
</record>
<menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="stock.next_id_61" sequence="1"/>
<menuitem action="action_stock_move_report_po" id="menu_action_stock_move_report_po" parent="stock.next_id_61" sequence="1"/>-->
</data>
</openerp>

9
addons/purchase/security/ir.model.access.csv
View File

@ -39,10 +39,6 @@ access_account_move,account.move,account.model_account_move,group_purchase_user,
access_account_move_line,account.move.line,account.model_account_move_line,group_purchase_user,1,0,0,0
access_account_analytic_line,account.analytic.line,account.model_account_analytic_line,group_purchase_user,1,0,0,0
access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,group_purchase_user,1,0,0,0
access_report_stock_move,report.stock.move.manager,stock.model_report_stock_move,group_purchase_manager,1,0,0,0
access_report_stock_move_user,report.stock.move.user,stock.model_report_stock_move,group_purchase_user,1,0,0,0
access_stock_production_lot_user,stock.production.lot user,stock.model_stock_production_lot,group_purchase_user,1,1,1,0
access_stock_production_lot_revision,stock.production.lot.revision,stock.model_stock_production_lot_revision,group_purchase_user,1,1,1,0
access_res_partner_purchase_manager,res.partner.purchase.manager,base.model_res_partner,group_purchase_manager,1,1,1,0
access_product_uom_categ_purchase_manager,product.uom.categ purchase_manager,product.model_product_uom_categ,purchase.group_purchase_manager,1,1,1,1
access_product_uom_purchase_manager,product.uom purchase_manager,product.model_product_uom,purchase.group_purchase_manager,1,1,1,1
@ -61,7 +57,6 @@ access_product_pricelist_version_purchase_manager,product.pricelist.version purc
access_product_pricelist_item_purchase_manager,product.pricelist.item purchase_manager,product.model_product_pricelist_item,purchase.group_purchase_manager,1,1,1,1
access_account_account_purchase_manager,account.account purchase manager,account.model_account_account,purchase.group_purchase_manager,1,0,0,0
access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0
access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
39 access_account_move_line account.move.line account.model_account_move_line group_purchase_user 1 0 0 0
40 access_account_analytic_line account.analytic.line account.model_account_analytic_line group_purchase_user 1 0 0 0
41 access_account_move_reconcile account.move.reconcile account.model_account_move_reconcile group_purchase_user 1 0 0 0
access_report_stock_move report.stock.move.manager stock.model_report_stock_move group_purchase_manager 1 0 0 0
access_report_stock_move_user report.stock.move.user stock.model_report_stock_move group_purchase_user 1 0 0 0
access_stock_production_lot_user stock.production.lot user stock.model_stock_production_lot group_purchase_user 1 1 1 0
access_stock_production_lot_revision stock.production.lot.revision stock.model_stock_production_lot_revision group_purchase_user 1 1 1 0
42 access_res_partner_purchase_manager res.partner.purchase.manager base.model_res_partner group_purchase_manager 1 1 1 0
43 access_product_uom_categ_purchase_manager product.uom.categ purchase_manager product.model_product_uom_categ purchase.group_purchase_manager 1 1 1 1
44 access_product_uom_purchase_manager product.uom purchase_manager product.model_product_uom purchase.group_purchase_manager 1 1 1 1
57 access_product_pricelist_item_purchase_manager product.pricelist.item purchase_manager product.model_product_pricelist_item purchase.group_purchase_manager 1 1 1 1
58 access_account_account_purchase_manager account.account purchase manager account.model_account_account purchase.group_purchase_manager 1 0 0 0
59 access_account_journal_purchase_manager account.journal purchase manager account.model_account_journal purchase.group_purchase_manager 1 0 0 0
access_stock_tracking_purchase_user stock.tracking purchase.user stock.model_stock_tracking purchase.group_purchase_user 1 1 1 0
60 access_stock_location_purchase_manager stock.location purchase manager stock.model_stock_location purchase.group_purchase_manager 1 0 0 0
61 access_stock_warehouse_orderpoint_manager stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint stock.model_stock_warehouse_orderpoint purchase.group_purchase_manager 1 0 0 0
62 access_stock_warehouse_orderpoint_manager stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint stock.model_stock_warehouse_orderpoint group_purchase_user 1 0 0 0

5
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -180,7 +180,7 @@
<record model="ir.ui.view" id="product_normal_form_view_inherit">
<field name="name">product.form.inherit</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
<field name="inherit_id" ref="stock.product_form_view_procurement_button"/>
<field name="arch" type="xml">
<field name="supply_method" position="after">
<field name="purchase_requisition"/>
@ -188,6 +188,7 @@
</field>
</record>
<!-- CRASH FOR UNKNOW REASON, reason is : invalid model
<record model="ir.ui.view" id="procurement_normal_form_view_inherit">
<field name="name">procurement.form.inherit</field>
<field name="model">procurement.order</field>
@ -197,7 +198,7 @@
<field name="requisition_id"/>
</xpath>
</field>
</record>
</record>-->
<act_window
domain="[('requisition_id', '=', active_id)]"
context="{'default_requisition_id': active_id}"

2
addons/sale_stock/__openerp__.py
View File

@ -55,7 +55,7 @@ You can choose flexible invoicing methods:
'stock_view.xml',
'res_config_view.xml',
'report/sale_report_view.xml',
'process/sale_stock_process.xml',
#'process/sale_stock_process.xml',
],
'demo_xml': ['sale_stock_demo.xml'],
'test': ['test/cancel_order_sale_stock.yml',

2
addons/sale_stock/process/sale_stock_process.xml
View File

@ -16,7 +16,7 @@
<record id="process_node_saleprocurement0" model="process.node">
<field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
<field name="menu_id" ref="stock.menu_stock_procurement_action"/>
<field name="model_id" ref="procurement.model_procurement_order"/>
<field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>

9
addons/sale_stock/sale_stock.py
View File

@ -34,7 +34,6 @@ class sale_order(osv.osv):
default = {}
default.update({
'shipped': False,
'picking_ids': [],
})
return super(sale_order, self).copy(cr, uid, id, default, context=context)
@ -318,6 +317,12 @@ class sale_order(osv.osv):
return True
return False
class stock_move(osv.osv):
_inherit = 'stock.move'
_columns = {
'sale_line_id': fields.many2one('sale.order.line', 'Sale Line'),
}
class sale_order_line(osv.osv):
@ -334,7 +339,7 @@ class sale_order_line(osv.osv):
_columns = {
'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation and the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
'procurement_id': fields.many2one('procurement.order', 'Procurement'),
'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
#'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
'product_packaging': fields.many2one('product.packaging', 'Packaging'),
'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'),

8
addons/sale_stock/sale_stock_view.xml
View File

@ -12,11 +12,11 @@
<button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
<button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
</xpath>
<xpath expr="//button[@name='action_view_invoice']" position="after">
<!--<xpath expr="//button[@name='action_view_invoice']" position="after">
<field name="picking_ids" invisible="1"/>
<button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}" groups="base.group_user"/>
</xpath>
</xpath>-->
<xpath expr="//button[@name='action_cancel']" position="after">
<button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
</xpath>
@ -51,10 +51,10 @@
<field name="delay" class="oe_inline"/> days
</div>
</xpath>
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
<!--<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
<field name="property_ids" widget="many2many_tags"
groups="sale.group_mrp_properties"/>
</xpath>
</xpath>-->
<xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
<field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging" />
</xpath>

3
addons/sale_stock/security/ir.model.access.csv
View File

@ -6,11 +6,10 @@ access_procurement_salesman,procurement.order salesman,procurement.model_procure
access_procurement_manager,procurement.order manager,procurement.model_procurement_order,base.group_sale_manager,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_report_stock_move_sales,report.stock.move.sale,stock.model_report_stock_move,base.group_sale_manager,1,1,1,1
access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,base.group_sale_manager,1,1,1,1
access_product_packaging_user,product.packaging.user,product.model_product_packaging,base.group_sale_salesman,1,1,1,0
access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,base.group_sale_manager,1,0,0,0
access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
access_stock_location_user,stock.location.user,stock.model_stock_location,base.group_sale_salesman,1,0,0,0
access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,base.group_sale_manager,1,1,1,1
access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
6 access_procurement_manager procurement.order manager procurement.model_procurement_order base.group_sale_manager 1 1 1 1
7 access_sale_order_stock_worker sale.order stock worker model_sale_order stock.group_stock_user 1 1 0 0
8 access_sale_order_line_stock_worker sale.order.line stock worker model_sale_order_line stock.group_stock_user 1 1 0 0
access_report_stock_move_sales report.stock.move.sale stock.model_report_stock_move base.group_sale_manager 1 1 1 1
9 access_stock_picking_sales stock.picking.sales stock.model_stock_picking base.group_sale_manager 1 1 1 1
10 access_product_packaging_user product.packaging.user product.model_product_packaging base.group_sale_salesman 1 1 1 0
11 access_product_packaging_manager product.packaging.manager product.model_product_packaging base.group_sale_manager 1 0 0 0
12 access_stock_warehouse_user stock.warehouse.user stock.model_stock_warehouse base.group_sale_salesman 1 0 0 0
13 access_stock_location_user stock.location.user stock.model_stock_location base.group_sale_salesman 1 0 0 0
14 access_product_packaging_sale_manager product.packaging salemanager product.model_product_packaging base.group_sale_manager 1 1 1 1
15 access_stock_warehouse_orderpoint_sale_salesman stock.warehouse.orderpoint procurement.model_stock_warehouse_orderpoint stock.model_stock_warehouse_orderpoint base.group_sale_salesman 1 0 0 0