openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01742
[Merge] lp:~openerp-dev/openobject-addons/ron-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2
ron(openerp) has proposed merging lp:~openerp-dev/openobject-addons/ron-dev-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#606325 EAN code validation fails
https://bugs.launchpad.net/bugs/606325
#627936 mrp: procurement from orderpoints is generated for non-active, non-purchasable products (5.0)
https://bugs.launchpad.net/bugs/627936
#634856 [mrp] constraint needed for orderpoints (5.0)
https://bugs.launchpad.net/bugs/634856
#663890 Creating invoices and grouping multiplies services
https://bugs.launchpad.net/bugs/663890
#666362 [6.0RC1] sale Invoice Control "Not from Picking" is bad wording
https://bugs.launchpad.net/bugs/666362
#667246 Wrong Journals when creating an invoice from picking
https://bugs.launchpad.net/bugs/667246
#667324 invoicing control in purchase orders
https://bugs.launchpad.net/bugs/667324
#669210 [trunk][mrp] stock_move.action_consume raises exception
https://bugs.launchpad.net/bugs/669210
#670056 [6.0RC1] stock moves - missing search field "Reference"
https://bugs.launchpad.net/bugs/670056
#670652 Demo data of purchase order is not relevant in terms of supplier address
https://bugs.launchpad.net/bugs/670652
#670921 Purchase module : problems in group by in seach view
https://bugs.launchpad.net/bugs/670921
#671172 Return packingnumber hardcoded {'name':'%s (return)' % pick.name
https://bugs.launchpad.net/bugs/671172
#671386 PO Line description doesn't take Supplier Product Name or Code in Product's Suppliers Tab
https://bugs.launchpad.net/bugs/671386
#673572 [6.0 RC1] Stock move in done state add a pack and production lot
https://bugs.launchpad.net/bugs/673572
#677429 [6.0RC1][purchase]Invoice journal(s) not loaded properly
https://bugs.launchpad.net/bugs/677429
#690228 shouldn't be able to change the company after have vaidated an inventory
https://bugs.launchpad.net/bugs/690228
#690581 Stock_planning : Unable to create Forecasting periods.
https://bugs.launchpad.net/bugs/690581
#690763 PRODUCT V6 : the ean13 check is incorrect
https://bugs.launchpad.net/bugs/690763
#691012 [trunk][mrp] bugfix on consuming materials introduced two new bugs
https://bugs.launchpad.net/bugs/691012
#691709 procurement exception when there is stock
https://bugs.launchpad.net/bugs/691709
#692827 Procurement Module view arch missing some fields in tree
https://bugs.launchpad.net/bugs/692827
#692913 [6.0] PO - Button "Approved" shows approved AND done
https://bugs.launchpad.net/bugs/692913
#693056 price_multi_get() is comparing pricelist_ids to pricelist_version_ids
https://bugs.launchpad.net/bugs/693056
#693806 Invalid literal for int() in sequence with prefix
https://bugs.launchpad.net/bugs/693806
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/ron-dev-addons2/+merge/44894
Bug:-https://bugs.launchpad.net/openobject-addons/+bug/693806
--
https://code.launchpad.net/~openerp-dev/openobject-addons/ron-dev-addons2/+merge/44894
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ron-dev-addons2.
=== modified file 'account/account_menuitem.xml'
=== modified file 'account/account_view.xml'
=== modified file 'account/wizard/account_report_aged_partner_balance.py'
=== modified file 'account_voucher/account_voucher.py'
=== modified file 'hr/security/ir.model.access.csv'
=== modified file 'hr_contract/security/ir.model.access.csv'
=== modified file 'hr_evaluation/hr_evaluation.py'
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
=== modified file 'hr_expense/security/ir.model.access.csv'
=== modified file 'hr_holidays/board_hr_holidays_view.xml'
=== modified file 'hr_holidays/hr_holidays_view.xml'
=== modified file 'hr_holidays/security/ir.model.access.csv'
=== modified file 'hr_payroll/__openerp__.py'
--- hr_payroll/__openerp__.py 2010-12-29 08:53:52 +0000
+++ hr_payroll/__openerp__.py 2010-12-30 12:04:11 +0000
@@ -55,10 +55,17 @@
'wizard/hr_payroll_year_salary.xml',
],
'test': [
+<<<<<<< TREE
'test/payslip.yml',
'test/payment_advice.yml',
'test/payroll_register.yml',
# 'test/hr_payroll_report.yml',
+=======
+ 'test/payslip.yml',
+ 'test/payment_advice.yml',
+ 'test/payroll_register.yml',
+# 'test/hr_payroll_report.yml',
+>>>>>>> MERGE-SOURCE
],
'demo_xml': [
'hr_payroll_demo.xml'
=== modified file 'hr_payroll/hr_payroll_view.xml'
=== modified file 'hr_timesheet/security/ir.model.access.csv'
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
=== modified file 'hr_timesheet_sheet/security/ir.model.access.csv'
=== modified file 'knowledge/security/ir.model.access.csv'
--- knowledge/security/ir.model.access.csv 2010-12-29 10:16:28 +0000
+++ knowledge/security/ir.model.access.csv 2010-12-30 12:04:11 +0000
@@ -1,4 +1,8 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
"access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
+<<<<<<< TREE
+=======
+"access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0
+>>>>>>> MERGE-SOURCE
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml 2010-12-30 05:13:19 +0000
+++ mrp/mrp_view.xml 2010-12-30 12:04:11 +0000
@@ -111,11 +111,18 @@
<menuitem
action="mrp_property_action"
id="menu_mrp_property_action"
+<<<<<<< TREE
parent="menu_mrp_property"/>
<menuitem
action="mrp_property_group_action"
parent="menu_mrp_property"
id="menu_mrp_property_group_action"/>
+=======
+ parent="menu_mrp_property"/>
+ <menuitem
+ action="mrp_property_group_action"
+ id="menu_mrp_property_group_action"/>
+>>>>>>> MERGE-SOURCE
<!--
Work Centers
=== modified file 'mrp/security/ir.model.access.csv'
--- mrp/security/ir.model.access.csv 2010-12-30 05:13:19 +0000
+++ mrp/security/ir.model.access.csv 2010-12-30 12:04:11 +0000
@@ -71,24 +71,49 @@
"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
"access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
-"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0
-"access_product_uom_categ_mrp_manager","product.uom.categ mrp_manager","product.model_product_uom_categ","mrp.group_mrp_manager",1,1,1,1
-"access_product_uom_mrp_manager","product.uom mrp_manager","product.model_product_uom","mrp.group_mrp_manager",1,1,1,1
-"access_product_ul_mrp_manager","product.ul mrp_manager","product.model_product_ul","mrp.group_mrp_manager",1,1,1,1
-"access_product_category_mrp_manager","product.category mrp_manager","product.model_product_category","mrp.group_mrp_manager",1,1,1,1
-"access_product_template_mrp_manager","product.template mrp_manager","product.model_product_template","mrp.group_mrp_manager",1,1,1,1
-"access_product_product_mrp_manager","product.product mrp_manager","product.model_product_product","mrp.group_mrp_manager",1,1,1,1
-"access_product_packaging_mrp_manager","product.packaging mrp_manager","product.model_product_packaging","mrp.group_mrp_manager",1,1,1,1
-"access_product_supplierinfo_mrp_manager","product.supplierinfo mrp_manager","product.model_product_supplierinfo","mrp.group_mrp_manager",1,1,1,1
-"access_pricelist_partnerinfo_mrp_manager","pricelist.partnerinfo mrp_manager","product.model_pricelist_partnerinfo","mrp.group_mrp_manager",1,1,1,1
-"access_product_price_type_mrp_manager","product.price.type mrp_manager","product.model_product_price_type","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1
-"access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
-"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1
-"access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1
-"access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
-"access_account_account_mrp_manager","account.account mrp manager","account.model_account_account","mrp.group_mrp_manager",1,0,0,0
-"access_account_journal_mrp_manager","account.journal mrp manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
-"access_stock_location_mrp_manager","stock.location product mrp manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
+<<<<<<< TREE
+"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0
+"access_product_uom_categ_mrp_manager","product.uom.categ mrp_manager","product.model_product_uom_categ","mrp.group_mrp_manager",1,1,1,1
+"access_product_uom_mrp_manager","product.uom mrp_manager","product.model_product_uom","mrp.group_mrp_manager",1,1,1,1
+"access_product_ul_mrp_manager","product.ul mrp_manager","product.model_product_ul","mrp.group_mrp_manager",1,1,1,1
+"access_product_category_mrp_manager","product.category mrp_manager","product.model_product_category","mrp.group_mrp_manager",1,1,1,1
+"access_product_template_mrp_manager","product.template mrp_manager","product.model_product_template","mrp.group_mrp_manager",1,1,1,1
+"access_product_product_mrp_manager","product.product mrp_manager","product.model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_product_packaging_mrp_manager","product.packaging mrp_manager","product.model_product_packaging","mrp.group_mrp_manager",1,1,1,1
+"access_product_supplierinfo_mrp_manager","product.supplierinfo mrp_manager","product.model_product_supplierinfo","mrp.group_mrp_manager",1,1,1,1
+"access_pricelist_partnerinfo_mrp_manager","pricelist.partnerinfo mrp_manager","product.model_pricelist_partnerinfo","mrp.group_mrp_manager",1,1,1,1
+"access_product_price_type_mrp_manager","product.price.type mrp_manager","product.model_product_price_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1
+"access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
+"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1
+"access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
+"access_account_account_mrp_manager","account.account mrp manager","account.model_account_account","mrp.group_mrp_manager",1,0,0,0
+"access_account_journal_mrp_manager","account.journal mrp manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
+"access_stock_location_mrp_manager","stock.location product mrp manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
+=======
+"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0
+"access_product_uom_categ_mrp_manager","product.uom.categ mrp_manager","product.model_product_uom_categ","mrp.group_mrp_manager",1,1,1,1
+"access_product_uom_mrp_manager","product.uom mrp_manager","product.model_product_uom","mrp.group_mrp_manager",1,1,1,1
+"access_product_ul_mrp_manager","product.ul mrp_manager","product.model_product_ul","mrp.group_mrp_manager",1,1,1,1
+"access_product_category_mrp_manager","product.category mrp_manager","product.model_product_category","mrp.group_mrp_manager",1,1,1,1
+"access_product_template_mrp_manager","product.template mrp_manager","product.model_product_template","mrp.group_mrp_manager",1,1,1,1
+"access_product_product_mrp_manager","product.product mrp_manager","product.model_product_product","mrp.group_mrp_manager",1,1,1,1
+"access_product_packaging_mrp_manager","product.packaging mrp_manager","product.model_product_packaging","mrp.group_mrp_manager",1,1,1,1
+"access_product_supplierinfo_mrp_manager","product.supplierinfo mrp_manager","product.model_product_supplierinfo","mrp.group_mrp_manager",1,1,1,1
+"access_pricelist_partnerinfo_mrp_manager","pricelist.partnerinfo mrp_manager","product.model_pricelist_partnerinfo","mrp.group_mrp_manager",1,1,1,1
+"access_product_price_type_mrp_manager","product.price.type mrp_manager","product.model_product_price_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_type_mrp_manager","product.pricelist.type mrp_manager","product.model_product_pricelist_type","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_mrp_manager","product.pricelist mrp_manager","product.model_product_pricelist","mrp.group_mrp_manager",1,1,1,1
+"access_ir_property_group_product_mrp_manager","ir_property group_product_mrp_manager","base.model_ir_property","mrp.group_mrp_manager",1,1,1,1
+"access_product_group_res_partner_mrp_manager","res_partner group_mrp_manager","base.model_res_partner","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_version_mrp_manager","product.pricelist.version mrp_manager","product.model_product_pricelist_version","mrp.group_mrp_manager",1,1,1,1
+"access_product_pricelist_item_mrp_manager","product.pricelist.item mrp_manager","product.model_product_pricelist_item","mrp.group_mrp_manager",1,1,1,1
+"access_resource_calendar_manufacturinguser","resource.calendar manufacturing.user","resource.model_resource_calendar","mrp.group_mrp_user",1,0,0,0
+"access_account_account_mrp_manager","account.account mrp manager","account.model_account_account","mrp.group_mrp_manager",1,0,0,0
+"access_account_journal_mrp_manager","account.journal mrp manager","account.model_account_journal","mrp.group_mrp_manager",1,0,0,0
+"access_stock_location_mrp_manager","stock.location product mrp manager","stock.model_stock_location","mrp.group_mrp_manager",1,0,0,0
+
+>>>>>>> MERGE-SOURCE
=== modified file 'procurement/procurement.py'
--- procurement/procurement.py 2010-12-29 11:27:14 +0000
+++ procurement/procurement.py 2010-12-30 12:04:11 +0000
@@ -529,6 +529,7 @@
}
_sql_constraints = [
('qty_multiple_check', 'CHECK( qty_multiple > 0 )', 'Qty Multiple must be greater than zero.'),
+ ('product_location_uniq', 'unique(product_id, location_id)', 'Only one order point per location is allowed!'),
]
def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None):
=== modified file 'procurement/procurement_view.xml'
=== modified file 'product/pricelist.py'
--- product/pricelist.py 2010-12-30 05:57:59 +0000
+++ product/pricelist.py 2010-12-30 12:04:11 +0000
@@ -163,15 +163,15 @@
# product.pricelist.version:
if pricelist_ids:
- pricelist_version_ids = pricelist_ids
+ plversions_search_ids = pricelist_ids
else:
# all pricelists:
- pricelist_version_ids = product_pricelist_version_obj.search(cr, uid, [])
+ plversions_search_ids = product_pricelist_version_obj.search(cr, uid, [])
- pricelist_version_ids = list(set(pricelist_version_ids))
+ plversions_search_ids = list(set(plversions_search_ids))
plversions_search_args = [
- ('pricelist_id', 'in', pricelist_version_ids),
+ ('pricelist_id', 'in', plversions_search_ids),
'|',
('date_start', '=', False),
('date_start', '<=', date),
@@ -180,8 +180,9 @@
('date_end', '>=', date),
]
- plversion_ids = product_pricelist_version_obj.search(cr, uid, plversions_search_args)
- if len(pricelist_version_ids) != len(plversion_ids):
+ pricelist_version_ids = product_pricelist_version_obj.search(cr, uid, plversions_search_args)
+
+ if len(plversions_search_ids) != len(pricelist_version_ids):
msg = "At least one pricelist has no active version !\nPlease create or activate one."
raise osv.except_osv(_('Warning !'), _(msg))
@@ -198,7 +199,7 @@
results = {}
for product_id, qty, partner in products_by_qty_by_partner:
- for pricelist_id in pricelist_version_ids:
+ for pricelist_id in plversions_search_ids:
price = False
tmpl_id = products_dict[product_id].product_tmpl_id and products_dict[product_id].product_tmpl_id.id or False
@@ -221,7 +222,11 @@
'AND (min_quantity IS NULL OR min_quantity <= %s) '
'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
'ORDER BY sequence',
+<<<<<<< TREE
(tmpl_id, product_id, plversion_ids[0], qty))
+=======
+ (tmpl_id, product_id, pricelist_version_ids[0], qty))
+>>>>>>> MERGE-SOURCE
res1 = cr.dictfetchall()
uom_price_already_computed = False
for res in res1:
=== modified file 'product_manufacturer/security/ir.model.access.csv'
--- product_manufacturer/security/ir.model.access.csv 2010-12-29 09:25:06 +0000
+++ product_manufacturer/security/ir.model.access.csv 2010-12-30 12:04:11 +0000
@@ -1,2 +1,10 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+<<<<<<< TREE
"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,1,1,1
+=======
+"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,0,0,0
+"access_product_manufacturer_attribute sale_manager","product.manufacturer.attribute","model_product_manufacturer_attribute","base.group_sale_manager",1,1,1,1
+"access_product_manufacturer_attribute_purchasemanager","product.manufacturer.attribute purchasemanager","model_product_manufacturer_attribute","purchase.group_purchase_manager",1,1,1,1
+"access_product_manufacturer_attribute_stockmanager","product.manufacturer.attribute stockmanager","model_product_manufacturer_attribute","stock.group_stock_manager",1,1,1,1
+"access_product_manufacturer_attribute_mrpmanager","product.manufacturer.attribute mrpmanager","model_product_manufacturer_attribute","mrp.group_mrp_manager",1,1,1,1
+>>>>>>> MERGE-SOURCE
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2010-12-29 13:18:49 +0000
+++ project/project_view.xml 2010-12-30 12:04:11 +0000
@@ -41,7 +41,12 @@
</group>
<group col="2" colspan="2" name="misc">
<separator colspan="2" string="Miscelleanous"/>
- <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+<<<<<<< TREE
+ <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+=======
+ <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
+ <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
+>>>>>>> MERGE-SOURCE
<field name="warn_manager"/>
</group>
<newline/>
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2010-12-30 05:13:19 +0000
+++ purchase/purchase_view.xml 2010-12-30 12:04:11 +0000
@@ -133,7 +133,11 @@
</calendar>
</field>
</record>
+<<<<<<< TREE
<record model="ir.ui.view" id="purchase_order_graph">
+=======
+ <record model="ir.ui.view" id="view_purchase_order_graph1">
+>>>>>>> MERGE-SOURCE
<field name="name">purchase.order.graph</field>
<field name="model">purchase.order</field>
<field name="type">graph</field>
=== modified file 'report_intrastat/security/ir.model.access.csv'
--- report_intrastat/security/ir.model.access.csv 2010-12-29 09:30:25 +0000
+++ report_intrastat/security/ir.model.access.csv 2010-12-30 12:04:11 +0000
@@ -1,6 +1,13 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_report_intrastat_code","report.intrastat.code","model_report_intrastat_code","account.group_account_manager",1,1,1,1
"access_report_intrastat","report.intrastat","model_report_intrastat","account.group_account_manager",1,0,0,0
-"access_report_intrastat_code_sale_manager","report.intrastat.code sale manager","model_report_intrastat_code","base.group_sale_manager",1,1,1,1
-"access_report_intrastat_code_purchase_manager","report.intrastat.code purchase manager","model_report_intrastat_code","purchase.group_purchase_manager",1,1,1,1
-"access_report_intrastat_code_stock_manager","report.intrastat.code stock manager","model_report_intrastat_code","stock.group_stock_manager",1,1,1,1
+<<<<<<< TREE
+"access_report_intrastat_code_sale_manager","report.intrastat.code sale manager","model_report_intrastat_code","base.group_sale_manager",1,1,1,1
+"access_report_intrastat_code_purchase_manager","report.intrastat.code purchase manager","model_report_intrastat_code","purchase.group_purchase_manager",1,1,1,1
+"access_report_intrastat_code_stock_manager","report.intrastat.code stock manager","model_report_intrastat_code","stock.group_stock_manager",1,1,1,1
+=======
+"access_report_intrastat_code_sale_manager","report.intrastat.code sale manager","model_report_intrastat_code","base.group_sale_manager",1,1,1,1
+"access_report_intrastat_code_purchase_manager","report.intrastat.code purchase manager","model_report_intrastat_code","purchase.group_purchase_manager",1,1,1,1
+"access_report_intrastat_code_stock_manager","report.intrastat.code stock manager","model_report_intrastat_code","stock.group_stock_manager",1,1,1,1
+"access_report_intrastat_code_mrp_manager","report.intrastat.code mrp manager","model_report_intrastat_code","mrp.group_mrp_manager",1,1,1,1
+>>>>>>> MERGE-SOURCE
=== modified file 'sale/board_sale_view.xml'
=== modified file 'sale/sale.py'
--- sale/sale.py 2010-12-30 05:13:19 +0000
+++ sale/sale.py 2010-12-30 12:04:11 +0000
@@ -738,12 +738,13 @@
proc_obj.write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
val = {}
+
+ if picking_id:
+ wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+
for proc_id in proc_ids:
wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
- if picking_id:
- wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-
if order.state == 'shipping_except':
val['state'] = 'progress'
val['shipped'] = False
=== modified file 'stock/stock.py'
--- stock/stock.py 2010-12-30 05:13:19 +0000
+++ stock/stock.py 2010-12-30 12:04:11 +0000
@@ -30,7 +30,7 @@
import tools
import decimal_precision as dp
import logging
-
+import string
#----------------------------------------------------------
# Incoterms
@@ -474,8 +474,20 @@
checksum = staticmethod(checksum)
def make_sscc(self, cr, uid, context=None):
- sequence = self.pool.get('ir.sequence').get(cr, uid, 'stock.lot.tracking')
- return sequence + str(self.checksum(sequence))
+
+ seq_obj = self.pool.get('ir.sequence')
+ prefix = seq_obj.search(cr,uid,[('code','=','stock.lot.tracking')])
+ seq_browse_obj = seq_obj.browse(cr,uid,prefix)[0]
+ digit_next = ''
+ pr=seq_browse_obj.prefix
+ sf=seq_browse_obj.suffix
+ padding=seq_browse_obj.padding
+ number_next=seq_browse_obj.number_next
+ sequence=seq_obj.get(cr, uid, 'stock.lot.tracking')
+ digit_next = str(number_next)
+ digit = string.zfill(digit_next, padding)
+
+ return (pr or '') + digit + str(self.checksum(digit)) + (sf or '')
_columns = {
'name': fields.char('Pack Reference', size=64, required=True, select=True),
=== modified file 'stock/stock_view.xml'
=== modified file 'stock_location/security/ir.model.access.csv'
--- stock_location/security/ir.model.access.csv 2010-12-29 12:05:59 +0000
+++ stock_location/security/ir.model.access.csv 2010-12-30 12:04:11 +0000
@@ -1,13 +1,27 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_product_pulled_flow_user","product_pulled_flow user","model_product_pulled_flow","stock.group_stock_user",1,0,0,0
"access_product_pulled_flow_manager","product_pulled_flow manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
-"access_product_pulled_flow_salemanager","product_pulled_flow salemanager","model_product_pulled_flow","base.group_sale_manager",1,1,1,1
-"access_product_pulled_flow_stock_manager","product_pulled_flow stock manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
+<<<<<<< TREE
+"access_product_pulled_flow_salemanager","product_pulled_flow salemanager","model_product_pulled_flow","base.group_sale_manager",1,1,1,1
+"access_product_pulled_flow_stock_manager","product_pulled_flow stock manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
+=======
+"access_product_pulled_flow_salemanager","product_pulled_flow salemanager","model_product_pulled_flow","base.group_sale_manager",1,1,1,1
+"access_product_pulled_flow_purchase_manager","product_pulled_flow purchase manager","model_product_pulled_flow","purchase.group_purchase_manager",1,1,1,1
+"access_product_pulled_flow_stock_manager","product_pulled_flow stock manager","model_product_pulled_flow","stock.group_stock_manager",1,1,1,1
+"access_product_pulled_flow_mrp_manager","product_pulled_flow mrp manager","model_product_pulled_flow","mrp.group_mrp_manager",1,1,1,1
+>>>>>>> MERGE-SOURCE
"access_stock_location_path_user","stock location path user","model_stock_location_path","stock.group_stock_user",1,0,0,0
"access_stock_location_path_internal_user","stock location path internal user","model_stock_location_path","base.group_user",1,0,0,0
"access_stock_location_path_manager","stock location path manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
-"access_stock_location_path_sale_manager","stock.location.path partner salemanager","model_stock_location_path","base.group_sale_manager",1,1,1,1
-"access_stock_location_path_stock_manager","stock.location.path stock manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
+<<<<<<< TREE
+"access_stock_location_path_sale_manager","stock.location.path partner salemanager","model_stock_location_path","base.group_sale_manager",1,1,1,1
+"access_stock_location_path_stock_manager","stock.location.path stock manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
+=======
+"access_stock_location_path_sale_manager","stock.location.path partner salemanager","model_stock_location_path","base.group_sale_manager",1,1,1,1
+"access_stock_location_path_purchase_manager","stock.location.path purchase manager","model_stock_location_path","purchase.group_purchase_manager",1,1,1,1
+"access_stock_location_path_stock_manager","stock.location.path stock manager","model_stock_location_path","stock.group_stock_manager",1,1,1,1
+"access_stock_location_path_mrp_manager","stock.location.path mrp manager","model_stock_location_path","mrp.group_mrp_manager",1,1,1,1
+>>>>>>> MERGE-SOURCE
"access_stock_location_path_stock_user","stock.location.path stock user","model_stock_location_path","stock.group_stock_user",1,1,1,1
"access_stock_location_path","stock.location.path","model_stock_location_path","base.group_sale_salesman",1,0,0,0
"access_product_pulled_flow","product.pulled.flow","model_product_pulled_flow","base.group_sale_salesman",1,0,0,0
Follow ups
