Sales - Workflow and Organization

Merge lp:~akretion-team/sale-wkfl/7.0-addmulticpny-sale-except-module-dbl into lp:~sale-core-editors/sale-wkfl/7.0

  1. 7.0-addmulticpny-sale-except-module-dbl
  2. Merge into 7.0
Proposed by David BEAL (ak)
Status: Needs review
Proposed branch: lp:~akretion-team/sale-wkfl/7.0-addmulticpny-sale-except-module-dbl
Merge into: lp:~sale-core-editors/sale-wkfl/7.0
Diff against target: 448 lines (+185/-122)
5 files modified
sale_exceptions/__openerp__.py (+30/-8)
sale_exceptions/i18n/sale_exceptions.pot (+127/-106)
sale_exceptions/sale.py (+11/-6)
sale_exceptions/sale_view.xml (+3/-2)
sale_exceptions/security/rule.xml (+14/-0)
To merge this branch: bzr merge lp:~akretion-team/sale-wkfl/7.0-addmulticpny-sale-except-module-dbl
Reviewer Review Type Date Requested Status
Pedro Manuel Baeza Needs Resubmitting
Benoit Guillot - http://www.akretion.com (community) code review, no test Approve
Review via email: mp+223750@code.launchpad.net

Description of the change

add multicompany support to sale_exceptions module

To post a comment you must log in.
Revision history for this message
Benoit Guillot - http://www.akretion.com (benoit-guillot-z) wrote :

LGTM

review: Approve (code review, no test)
Reply
lp:~akretion-team/sale-wkfl/7.0-addmulticpny-sale-except-module-dbl updated
49. By David BEAL (ak)

[FIX] module version

Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Please update pot file.

The rest LGTM.

Regards.

review: Needs Fixing (code review)
Reply
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Another thing: please comply with 80 cols PEP8.

Regards.

review: Needs Fixing (code review)
Reply
lp:~akretion-team/sale-wkfl/7.0-addmulticpny-sale-except-module-dbl updated
50. By David BEAL (ak)

[FIX] PEP8

51. By David BEAL (ak)

[FIX] add pot

Revision history for this message
David BEAL (ak) (davidbeal) wrote :

@pedro

fix is done

thanks for approve if ok

Regards

Reply
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Thanks for the changes.

Regards.

review: Approve (code review)
Reply
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

This project is now hosted on https://github.com/OCA/sale-workflow. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting
Reply

Unmerged revisions

51. By David BEAL (ak)

[FIX] add pot

50. By David BEAL (ak)

[FIX] PEP8

49. By David BEAL (ak)

[FIX] module version

48. By David BEAL (ak)

[IMP] add multicompany support to sale_exceptions module

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'sale_exceptions/__openerp__.py'
--- sale_exceptions/__openerp__.py 2013-11-15 12:19:07 +0000
+++ sale_exceptions/__openerp__.py 2014-06-19 21:07:47 +0000
@@ -21,26 +21,48 @@
21# along with this program. If not, see <http://www.gnu.org/licenses/>.21# along with this program. If not, see <http://www.gnu.org/licenses/>.
22#22#
23##############################################################################23##############################################################################
24
24{'name': 'Sale Exceptions',25{'name': 'Sale Exceptions',
25 'version': '0.1',26 'version': '1.0',
26 'category': 'Generic Modules/Sale',27 'category': 'Generic Modules/Sale',
27 'description': """28 'description': """
29
30DESCRIPTION
31============
28This module allows you attach several customizable exceptions to your sale order32This module allows you attach several customizable exceptions to your sale order
29 in a way that you can filter orders by exceptions type and fix them.33 in a way that you can filter orders by exceptions type and fix them.
3034
31This is especially useful in an order importation scenario such as with35This is especially useful in an order importation scenario such as with
32the base_sale_multi_channels module, because it's likely a few orders have errors36the base_sale_multi_channels module, because it's likely a few orders have errors
33when you import them (like product not found in OpenERP, wrong line format etc...)37when you import them (like product not found in OpenERP, wrong line format etc...)
38
39
40AUTHORS
41========
42
43Akretion
44----------
45 - Raphaël Valyi
46 - Renato Lima
47 - Sébastien BEAU <sebastien.beau@akretion.com>
48
49Camptocamp
50-----------
51 - Guewen Baconnier
52
34""",53""",
35 'author': 'Akretion',54 'author': 'Akretion',
36 'website': 'http://www.akretion.com',55 'website': 'http://www.akretion.com',
37 'depends': ['sale'],56 'depends': ['sale'],
38 'init_xml': ['settings/sale.exception.csv'],57 'data': [
39 'update_xml': ['sale_workflow.xml',58 'settings/sale.exception.csv',
40 'sale_view.xml',59 'sale_workflow.xml',
41 'sale_exceptions_data.xml',60 'sale_view.xml',
42 'wizard/sale_exception_confirm_view.xml',61 'sale_exceptions_data.xml',
43 'security/ir.model.access.csv'],62 'wizard/sale_exception_confirm_view.xml',
44 'demo_xml': [],63 'security/ir.model.access.csv',
64 'security/rule.xml',
65 ],
66 'demo': [],
45 'installable': True,67 'installable': True,
46 }68 }
4769
=== modified file 'sale_exceptions/i18n/sale_exceptions.pot'
--- sale_exceptions/i18n/sale_exceptions.pot 2013-11-15 12:55:29 +0000
+++ sale_exceptions/i18n/sale_exceptions.pot 2014-06-19 21:07:47 +0000
@@ -6,8 +6,8 @@
6msgstr ""6msgstr ""
7"Project-Id-Version: OpenERP Server 7.0\n"7"Project-Id-Version: OpenERP Server 7.0\n"
8"Report-Msgid-Bugs-To: \n"8"Report-Msgid-Bugs-To: \n"
9"POT-Creation-Date: 2013-05-02 06:57+0000\n"9"POT-Creation-Date: 2014-06-19 21:05+0000\n"
10"PO-Revision-Date: 2013-05-02 06:57+0000\n"10"PO-Revision-Date: 2014-06-19 21:05+0000\n"
11"Last-Translator: <>\n"11"Last-Translator: <>\n"
12"Language-Team: \n"12"Language-Team: \n"
13"MIME-Version: 1.0\n"13"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@
16"Plural-Forms: \n"16"Plural-Forms: \n"
1717
18#. module: sale_exceptions18#. module: sale_exceptions
19#: model:ir.model,name:sale_exceptions.model_sale_exception_confirm19#: field:sale.exception,active:0
20msgid "sale.exception.confirm"20msgid "Active"
21msgstr ""21msgstr ""
2222
23#. module: sale_exceptions23#. module: sale_exceptions
24#: selection:sale.exception,model:024#: view:sale.exception:0
25msgid "Sale Order Line"25msgid "Affected Sales Orders"
26msgstr ""26msgstr ""
2727
28#. module: sale_exceptions28#. module: sale_exceptions
@@ -31,8 +31,21 @@
31msgstr ""31msgstr ""
3232
33#. module: sale_exceptions33#. module: sale_exceptions
34#: model:sale.exception,name:sale_exceptions.excep_no_stock34#: view:sale.order:0
35msgid "Not Enough Virtual Stock"35msgid "Blocked in draft"
36msgstr ""
37
38#. module: sale_exceptions
39#: code:addons/sale_exceptions/sale.py:123
40#: model:ir.actions.act_window,name:sale_exceptions.action_sale_exception_confirm
41#: view:sale.exception.confirm:0
42#, python-format
43msgid "Blocked in draft due to exceptions"
44msgstr ""
45
46#. module: sale_exceptions
47#: field:sale.exception,company_id:0
48msgid "Company"
36msgstr ""49msgstr ""
3750
38#. module: sale_exceptions51#. module: sale_exceptions
@@ -41,34 +54,79 @@
41msgstr ""54msgstr ""
4255
43#. module: sale_exceptions56#. module: sale_exceptions
57#: code:addons/sale_exceptions/sale.py:211
58#, python-format
59msgid "Error"
60msgstr ""
61
62#. module: sale_exceptions
63#: code:addons/sale_exceptions/sale.py:212
64#, python-format
65msgid "Error when evaluating the sale exception rule:\n"
66" %s \n"
67"(%s)"
68msgstr ""
69
70#. module: sale_exceptions
71#: view:sale.order:0
72msgid "Error:"
73msgstr ""
74
75#. module: sale_exceptions
76#: view:sale.order:0
77msgid "Exception"
78msgstr ""
79
80#. module: sale_exceptions
81#: field:sale.exception,name:0
82msgid "Exception Name"
83msgstr ""
84
85#. module: sale_exceptions
86#: model:ir.actions.act_window,name:sale_exceptions.action_sale_test_tree
87#: model:ir.ui.menu,name:sale_exceptions.menu_sale_test
88msgid "Exception Rules"
89msgstr ""
90
91#. module: sale_exceptions
92#: field:sale.order,exceptions_ids:0
93msgid "Exceptions"
94msgstr ""
95
96#. module: sale_exceptions
97#: field:sale.exception.confirm,exception_ids:0
98msgid "Exceptions to resolve"
99msgstr ""
100
101#. module: sale_exceptions
44#: help:sale.exception,sequence:0102#: help:sale.exception,sequence:0
45msgid "Gives the sequence order when applying the test"103msgid "Gives the sequence order when applying the test"
46msgstr ""104msgstr ""
47105
48#. module: sale_exceptions106#. module: sale_exceptions
49#: view:sale.exception.confirm:0107#: field:sale.exception.confirm,ignore:0
50msgid "Sale Exceptions On Sale Order"108#: field:sale.order,ignore_exceptions:0
51msgstr ""109msgid "Ignore Exceptions"
52110msgstr ""
53#. module: sale_exceptions111
54#: field:sale.exception.confirm,exception_ids:0112#. module: sale_exceptions
55msgid "Exceptions to resolve"113#: field:sale.order,main_exception_id:0
56msgstr ""114msgid "Main Exception"
57115msgstr ""
58#. module: sale_exceptions116
59#: view:sale.exception.confirm:0117#. module: sale_exceptions
60msgid "_Ok"118#: model:sale.exception,name:sale_exceptions.excep_no_zip
61msgstr ""119msgid "No ZIP code on destination"
62120msgstr ""
63#. module: sale_exceptions121
64#: view:sale.exception:0122#. module: sale_exceptions
65#: view:sale.exception.confirm:0123#: model:sale.exception,name:sale_exceptions.excep_no_stock
66msgid "Sale Exception"124msgid "Not Enough Virtual Stock"
67msgstr ""125msgstr ""
68126
69#. module: sale_exceptions127#. module: sale_exceptions
70#: view:sale.order:0128#: field:sale.exception,code:0
71msgid "TO FIX"129msgid "Python Code"
72msgstr ""130msgstr ""
73131
74#. module: sale_exceptions132#. module: sale_exceptions
@@ -77,55 +135,47 @@
77msgstr ""135msgstr ""
78136
79#. module: sale_exceptions137#. module: sale_exceptions
80#: view:sale.order:0
81msgid "Exception"
82msgstr ""
83
84#. module: sale_exceptions
85#: view:sale.order:0
86msgid "Error:"
87msgstr ""
88
89#. module: sale_exceptions
90#: selection:sale.exception,model:0
91msgid "Sale Order"
92msgstr ""
93
94#. module: sale_exceptions
95#: field:sale.exception.confirm,sale_id:0138#: field:sale.exception.confirm,sale_id:0
96msgid "Sale"139msgid "Sale"
97msgstr ""140msgstr ""
98141
99#. module: sale_exceptions142#. module: sale_exceptions
100#: field:sale.exception,active:0143#: view:sale.exception:0
101msgid "Active"144msgid "Sale Exception"
102msgstr ""145msgstr ""
103146
104#. module: sale_exceptions147#. module: sale_exceptions
105#: field:sale.exception,name:0148#: view:sale.exception:0
106msgid "Exception Name"149msgid "Sale Exception Setup"
107msgstr ""150msgstr ""
108151
109#. module: sale_exceptions152#. module: sale_exceptions
110#: field:sale.order,exceptions_ids:0153#: code:_description:0
111msgid "Exceptions"
112msgstr ""
113
114#. module: sale_exceptions
115#: model:ir.actions.act_window,name:sale_exceptions.action_sale_exception_confirm
116#: model:ir.model,name:sale_exceptions.model_sale_exception154#: model:ir.model,name:sale_exceptions.model_sale_exception
117#: view:sale.exception.confirm:0155#: view:sale.exception.confirm:0
156#, python-format
118msgid "Sale Exceptions"157msgid "Sale Exceptions"
119msgstr ""158msgstr ""
120159
121#. module: sale_exceptions160#. module: sale_exceptions
122#: model:ir.actions.act_window,name:sale_exceptions.action_sale_test_tree161#: selection:sale.exception,model:0
123#: model:ir.ui.menu,name:sale_exceptions.menu_sale_test162msgid "Sale Order"
124msgid "Exception Rules"163msgstr ""
125msgstr ""164
126165#. module: sale_exceptions
127#. module: sale_exceptions166#: selection:sale.exception,model:0
167msgid "Sale Order Line"
168msgstr ""
169
170#. module: sale_exceptions
171#: field:sale.exception,sale_order_ids:0
172msgid "Sale Orders"
173msgstr ""
174
175#. module: sale_exceptions
176#: code:_description:0
128#: model:ir.model,name:sale_exceptions.model_sale_order177#: model:ir.model,name:sale_exceptions.model_sale_order
178#, python-format
129msgid "Sales Order"179msgid "Sales Order"
130msgstr ""180msgstr ""
131181
@@ -135,43 +185,14 @@
135msgstr ""185msgstr ""
136186
137#. module: sale_exceptions187#. module: sale_exceptions
138#: field:sale.exception,code:0188#: view:sale.exception.confirm:0
139msgid "Python Code"189msgid "_Close"
140msgstr ""190msgstr ""
141191
142#. module: sale_exceptions192#. module: sale_exceptions
143#: view:sale.order:0193#: code:_description:0
144msgid "Sales"194#: model:ir.model,name:sale_exceptions.model_sale_exception_confirm
145msgstr ""195#, python-format
146196msgid "sale.exception.confirm"
147#. module: sale_exceptions
148#: model:sale.exception,name:sale_exceptions.excep_no_zip
149msgid "No ZIP code on destination"
150msgstr ""
151
152#. module: sale_exceptions
153#: view:sale.exception:0
154msgid "Sale Exception Setup"
155msgstr ""
156
157#. module: sale_exceptions
158#: view:sale.exception:0
159msgid "Affected Sales Orders"
160msgstr ""
161
162#. module: sale_exceptions
163#: field:sale.exception,sale_order_ids:0
164msgid "Sale Orders"
165msgstr ""
166
167#. module: sale_exceptions
168#: field:sale.exception.confirm,ignore:0
169#: field:sale.order,ignore_exceptions:0
170msgid "Ignore Exceptions"
171msgstr ""
172
173#. module: sale_exceptions
174#: field:sale.order,main_exception_id:0
175msgid "Main Exception"
176msgstr ""197msgstr ""
177198
178199
=== modified file 'sale_exceptions/sale.py'
--- sale_exceptions/sale.py 2013-11-15 12:55:29 +0000
+++ sale_exceptions/sale.py 2014-06-19 21:07:47 +0000
@@ -28,12 +28,13 @@
28from openerp.tools.translate import _28from openerp.tools.translate import _
2929
3030
31class sale_exception(orm.Model):31class SaleException(orm.Model):
32 _name = "sale.exception"32 _name = "sale.exception"
33 _description = "Sale Exceptions"33 _description = "Sale Exceptions"
34 _order = "active desc, sequence asc"34 _order = "active desc, sequence asc"
35 _columns = {35 _columns = {
36 'name': fields.char('Exception Name', required=True, translate=True),36 'name': fields.char('Exception Name', required=True, translate=True),
37 'company_id': fields.many2one('res.company', 'Company'),
37 'description': fields.text('Description', translate=True),38 'description': fields.text('Description', translate=True),
38 'sequence': fields.integer(39 'sequence': fields.integer(
39 'Sequence',40 'Sequence',
@@ -64,11 +65,14 @@
64# - cr: database cursor65# - cr: database cursor
65# - uid: current user id66# - uid: current user id
66# - context: current context67# - context: current context
67"""68""",
69 'company_id': lambda s, cr, uid, c:
70 s.pool['res.company']._company_default_get(
71 cr, uid, 'sale.exception', context=c),
68 }72 }
6973
7074
71class sale_order(orm.Model):75class SaleOrder(orm.Model):
72 _inherit = "sale.order"76 _inherit = "sale.order"
7377
74 _order = 'main_exception_id asc, date_order desc, name desc'78 _order = 'main_exception_id asc, date_order desc, name desc'
@@ -133,8 +137,8 @@
133 if exception_ids:137 if exception_ids:
134 return self._popup_exceptions(cr, uid, ids[0], context=context)138 return self._popup_exceptions(cr, uid, ids[0], context=context)
135 else:139 else:
136 return super(sale_order, self).action_button_confirm(cr, uid, ids,140 return super(SaleOrder, self).action_button_confirm(cr, uid, ids,
137 context=context)141 context=context)
138142
139 def test_exceptions(self, cr, uid, ids, context=None):143 def test_exceptions(self, cr, uid, ids, context=None):
140 """144 """
@@ -233,4 +237,5 @@
233 default.update({237 default.update({
234 'ignore_exceptions': False,238 'ignore_exceptions': False,
235 })239 })
236 return super(sale_order, self).copy(cr, uid, id, default=default, context=context)240 return super(SaleOrder, self).copy(
241 cr, uid, id, default=default, context=context)
237242
=== modified file 'sale_exceptions/sale_view.xml'
--- sale_exceptions/sale_view.xml 2013-11-15 12:55:29 +0000
+++ sale_exceptions/sale_view.xml 2014-06-19 21:07:47 +0000
@@ -28,9 +28,10 @@
28 <group col="4" colspan="4" groups="base.group_sale_manager">28 <group col="4" colspan="4" groups="base.group_sale_manager">
29 <field name="active"/>29 <field name="active"/>
30 <field name="sequence"/>30 <field name="sequence"/>
31 <group colspan="4" col="2" groups="base.group_system">31 <group colspan="4" col="4" groups="base.group_system">
32 <field name="model"/>32 <field name="model"/>
33 <field name="code"/>33 <field name="company_id" groups="base.group_multi_company"/>
34 <field name="code" colspan="4"/>
34 </group>35 </group>
35 </group>36 </group>
36 <group colspan="4" col="2">37 <group colspan="4" col="2">
3738
=== added file 'sale_exceptions/security/rule.xml'
--- sale_exceptions/security/rule.xml 1970-01-01 00:00:00 +0000
+++ sale_exceptions/security/rule.xml 2014-06-19 21:07:47 +0000
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data noupdate="1">
4
5 <record id="sale_exception_comp_rule" model="ir.rule">
6 <field name="name">Sale exception multi-company</field>
7 <field name="model_id" ref="model_sale_exception"/>
8 <field name="global" eval="True"/>
9 <field name="domain_force">
10['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
11 </record>
12
13 </data>
14</openerp>

Subscribers

People subscribed via source and target branches