1
=== modified file 'l10n_mx_invoice_datetime/__openerp__.py'
2
--- l10n_mx_invoice_datetime/__openerp__.py	2013-07-16 22:00:59 +0000
3
+++ l10n_mx_invoice_datetime/__openerp__.py	2014-06-11 23:16:42 +0000
4
@@ -42,7 +42,7 @@
5
42
    ],
42
    ],
6
43
    "demo" : [],
43
    "demo" : [],
7
44
    "data" : [
44
    "data" : [
9
45
        #"security/dateinvoice_security.xml",
45
        "security/l10n_mx_facturae_security_groups_date.xml",
10
46
        "account_invoice_view.xml"
46
        "account_invoice_view.xml"
11
47
    ],
47
    ],
12
48
    "installable" : True,
48
    "installable" : True,
13
49
49
14
=== modified file 'l10n_mx_invoice_datetime/account_invoice_view.xml'
15
--- l10n_mx_invoice_datetime/account_invoice_view.xml	2013-07-30 16:24:23 +0000
16
+++ l10n_mx_invoice_datetime/account_invoice_view.xml	2014-06-11 23:16:42 +0000
17
@@ -7,10 +7,10 @@
18
7
            <field name="inherit_id" ref="account.invoice_form"/>
7
            <field name="inherit_id" ref="account.invoice_form"/>
19
8
            <field name="arch" type="xml">
8
            <field name="arch" type="xml">
20
9
                <xpath expr="//field[@name='date_invoice']" position="after">
9
                <xpath expr="//field[@name='date_invoice']" position="after">
22
10
                    <field name="invoice_datetime" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_manager"/>
10
                    <field name="invoice_datetime" groups="l10n_mx_invoice_datetime.group_datetime_invoice_l10n_mx_facturae"/>
23
11
                </xpath>
11
                </xpath>
24
12
                <xpath expr="//field[@name='date_invoice']" position="replace">
12
                <xpath expr="//field[@name='date_invoice']" position="replace">
26
13
                    <field name="date_invoice" groups="l10n_mx_facturae_groups.group_l10n_mx_facturae_user"/>
13
                    <field name="date_invoice" groups="l10n_mx_invoice_datetime.group_date_invoice_l10n_mx_facturae"/>
27
14
                </xpath>
14
                </xpath>
28
15
            </field>
15
            </field>
29
16
        </record>
16
        </record>
30
17
17
31
=== modified file 'l10n_mx_invoice_datetime/invoice.py'
32
--- l10n_mx_invoice_datetime/invoice.py	2013-12-19 16:24:01 +0000
33
+++ l10n_mx_invoice_datetime/invoice.py	2014-06-11 23:16:42 +0000
34
@@ -158,8 +158,38 @@
35
158
                    values['invoice_datetime'],
158
                    values['invoice_datetime'],
36
159
                    '%Y-%m-%d %H:%M:%S').date().strftime('%Y-%m-%d')
159
                    '%Y-%m-%d %H:%M:%S').date().strftime('%Y-%m-%d')
37
160
                if date_invoice != values['date_invoice']:
160
                if date_invoice != values['date_invoice']:
40
161
                    raise osv.except_osv(_('Warning!'),
161
                    groups_obj = self.pool.get('res.groups')
41
162
                            _('Invoice dates should be equal'))
162
                    group_datetime = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'l10n_mx_invoice_datetime', 'group_datetime_invoice_l10n_mx_facturae')
42
163
                    group_date = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'l10n_mx_invoice_datetime', 'group_date_invoice_l10n_mx_facturae')
43
164
                    if group_datetime and group_date:
44
165
                        users_datetime = []
45
166
                        users_date = []
46
167
                        for user in groups_obj.browse(cr, uid, [group_datetime[1]], context=context)[0].users:
47
168
                            users_datetime.append(user.id)
48
169
                        for user in groups_obj.browse(cr, uid, [group_date[1]], context=context)[0].users:
49
170
                            users_date.append(user.id)
50
171
                        if uid in users_datetime:
51
172
                            date_invoice = fields.datetime.context_timestamp(cr, uid,
52
173
                                datetime.datetime.strptime(values['invoice_datetime'],
53
174
                                tools.DEFAULT_SERVER_DATETIME_FORMAT), context=context)
54
175
                            res['date_invoice'] = date_invoice
55
176
                            res['invoice_datetime'] = values['invoice_datetime']
56
177
                        elif uid in users_date:
57
178
                            user_hour = self._get_time_zone(cr, uid, [], context=context)
58
179
                            time_invoice = datetime.time(abs(user_hour), 0, 0)
59
180
60
181
                            date_invoice = datetime.datetime.strptime(
61
182
                                values['date_invoice'], '%Y-%m-%d').date()
62
183
                                
63
184
                            dt_invoice = datetime.datetime.combine(
64
185
                                date_invoice, time_invoice).strftime('%Y-%m-%d %H:%M:%S')
65
186
66
187
                            res['invoice_datetime'] = dt_invoice
67
188
                            res['date_invoice'] = values['date_invoice']
68
189
                        else:
69
190
                            raise osv.except_osv(_('Warning!'), _('Invoice dates should be equal'))
70
191
                    else:
71
192
                        raise osv.except_osv(_('Warning!'), _('Invoice dates should be equal'))
72
163
                            
193
                            
73
164
        if  not values.get('invoice_datetime', False) and\
194
        if  not values.get('invoice_datetime', False) and\
74
165
                                        not values.get('date_invoice', False):
195
                                        not values.get('date_invoice', False):
75
@@ -170,10 +200,11 @@
76
170
200
77
171
    def action_move_create(self, cr, uid, ids, context=None):
201
    def action_move_create(self, cr, uid, ids, context=None):
78
172
        for inv in self.browse(cr, uid, ids, context=context):
202
        for inv in self.browse(cr, uid, ids, context=context):
84
173
            vals_date = self.assigned_datetime(cr, uid,
203
            if inv.type in ('out_invoice', 'out_refund'):
85
174
                {'invoice_datetime': inv.invoice_datetime,
204
                vals_date = self.assigned_datetime(cr, uid,
86
175
                    'date_invoice': inv.date_invoice},
205
                    {'invoice_datetime': inv.invoice_datetime,
87
176
                    context=context)
206
                        'date_invoice': inv.date_invoice},
88
177
            self.write(cr, uid, ids, vals_date, context=context)
207
                        context=context)
89
208
                self.write(cr, uid, ids, vals_date, context=context)
90
178
        return super(account_invoice,
209
        return super(account_invoice,
91
179
                        self).action_move_create(cr, uid, ids, context=context)
210
                        self).action_move_create(cr, uid, ids, context=context)
92
180
211
93
=== added file 'l10n_mx_invoice_datetime/security/l10n_mx_facturae_security_groups_date.xml'
94
--- l10n_mx_invoice_datetime/security/l10n_mx_facturae_security_groups_date.xml	1970-01-01 00:00:00 +0000
95
+++ l10n_mx_invoice_datetime/security/l10n_mx_facturae_security_groups_date.xml	2014-06-11 23:16:42 +0000
96
@@ -0,0 +1,29 @@
97
1
<?xml version="1.0" encoding="utf-8"?>
98
2
<openerp>
99
3
    <data noupdate="1">
100
4
        
101
5
        <record model="ir.module.category" id="module_date_invoice_l10n_mx_facturae">
102
6
            <field name="name">Fecha FacturaE</field>
103
7
            <field name="description">Indicate tue type of date that need was colocated in the invoice</field>
104
8
            <field name="sequence">999</field>
105
9
        </record>
106
10
        
107
11
        <record id="group_date_invoice_l10n_mx_facturae" model="res.groups">
108
12
            <field name="name">Date</field>
109
13
            <field name="comment">Date</field>
110
14
            <field name="category_id" ref="module_date_invoice_l10n_mx_facturae"/>
111
15
        </record>
112
16
        
113
17
        <record id="group_datetime_invoice_l10n_mx_facturae" model="res.groups">
114
18
            <field name="name">DateTime</field>
115
19
            <field name="comment">Date Time</field>
116
20
            <field name="category_id" ref="module_date_invoice_l10n_mx_facturae"/>
117
21
            <field name="users" eval="[(4, ref('base.user_root'))]"/>
118
22
        </record>
119
23
        
120
24
        <record id="group_datetime_invoice_l10n_mx_facturae" model="res.groups">
121
25
            <field name="implied_ids" eval="[(4, ref('group_datetime_invoice_l10n_mx_facturae'))]"/>
122
26
        </record>
123
27
        
124
28
    </data>
125
29
</openerp>
Reviewer	Date Requested	Status
Moisés López - http://www.vauxoo.com		Approve on 2014-07-22
Luis Torres - http://www.vauxoo.com (community)		Needs Resubmitting on 2014-06-11
Julio Serna-http://www.vauxoo.com	2014-05-08	Pending
Review via email: mp+218887@code.launchpad.net