Merge lp:~unifield-team/unifield-addons/UF_2139 into lp:unifield-addons

[jftempo]

=== modified file 'account/sequence.py'
--- account/sequence.py	2011-01-14 00:11:01 +0000
+++ account/sequence.py	2013-12-03 16:42:19 +0000
@@ -46,11 +46,11 @@
         'fiscal_ids': fields.one2many('account.sequence.fiscalyear',
             'sequence_main_id', 'Sequences')
     }
-    def get_id(self, cr, uid, sequence_id, test='id', context=None):
+    def get_id(self, cr, uid, sequence_id, code_or_id='id', context=None):
         if context is None:
             context = {}
         cr.execute('select id from ir_sequence where '
-                   + test + '=%s and active=%s', (sequence_id, True,))
+                   + code_or_id + '=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:
             for line in self.browse(cr, uid, res['id'],
@@ -58,11 +58,11 @@
                 if line.fiscalyear_id.id == context.get('fiscalyear_id', False):
                     return super(ir_sequence, self).get_id(cr, uid,
                                                            line.sequence_id.id,
-                                                           test="id",
+                                                           code_or_id="id",
                                                            context=context)
-        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test,
+        return super(ir_sequence, self).get_id(cr, uid, sequence_id, code_or_id,
                                                context=context)
 
 ir_sequence()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/test/account_customer_invoice.yml'
--- account/test/account_customer_invoice.yml	2011-01-14 00:11:01 +0000
+++ account/test/account_customer_invoice.yml	2013-12-03 16:42:19 +0000
@@ -19,6 +19,15 @@
     partner_id: base.res_partner_3
     reference_type: none
 -
+  I overwrite periods with right number and open them (UF-2139 Unifield ticket)
+-
+  !python {model: account.period}: |
+    import datetime
+    period_ids = self.search(cr, uid, [], order='date_start, name')
+    for p in self.browse(cr, uid, period_ids):
+      self.write(cr, uid, [p.id], {'number': int(datetime.datetime.strptime(p.date_start, '%Y-%m-%d').strftime('%m'))})
+      self.action_set_state(cr, uid, period_ids, {'state': 'draft'})
+-
   I check that Initially customer invoice is in the "Draft" state
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:

=== modified file 'account_payment/test/account_payment.yml'
--- account_payment/test/account_payment.yml	2011-01-14 00:11:01 +0000
+++ account_payment/test/account_payment.yml	2013-12-03 16:42:19 +0000
@@ -10,7 +10,15 @@
     sequence: 0.0
     state: bank
     bank: base.res_bank_1
-
+-
+  I overwrite periods with right number and open them
+-
+  !python {model: account.period}: |
+    import datetime
+    period_ids = self.search(cr, uid, [], order='date_start, name')
+    for p in self.browse(cr, uid, period_ids):
+      self.write(cr, uid, [p.id], {'number': int(datetime.datetime.strptime(p.date_start, '%Y-%m-%d').strftime('%m'))})
+      self.action_set_state(cr, uid, period_ids, {'state': 'draft'})
 -
   I created a new Payment Mode
 -
@@ -20,7 +28,6 @@
     bank_id: res_partner_bank_0
     journal: account.bank_journal
     name: TestMode
-
 -
   I created a Supplier Invoice
 -

=== modified file 'account_voucher/test/account_voucher.yml'
--- account_voucher/test/account_voucher.yml	2011-08-31 13:34:01 +0000
+++ account_voucher/test/account_voucher.yml	2013-12-03 16:42:19 +0000
@@ -9,6 +9,15 @@
     name: Current Period
     special: 1
 -
+  I overwrite periods with right number and open them (UF-2139 Unifield ticket)
+-
+  !python {model: account.period}: |
+    import datetime
+    period_ids = self.search(cr, uid, [], order='date_start, name')
+    for p in self.browse(cr, uid, period_ids):
+      self.write(cr, uid, [p.id], {'number': int(datetime.datetime.strptime(p.date_start, '%Y-%m-%d').strftime('%m'))})
+      self.action_set_state(cr, uid, period_ids, {'state': 'draft'})
+-
   In order to check account voucher module in OpenERP I create a customer voucher
 -
   !record {model: account.voucher, id: account_voucher_voucherforaxelor0}:

=== modified file 'purchase/test/purchase_from_order.yml'
--- purchase/test/purchase_from_order.yml	2011-08-18 08:36:51 +0000
+++ purchase/test/purchase_from_order.yml	2013-12-03 16:42:19 +0000
@@ -43,6 +43,15 @@
     partner_id: base.res_partner_4
     pricelist_id: purchase.list0
 -
+  I overwrite periods with right number and open them
+-
+  !python {model: account.period}: |
+    import datetime
+    period_ids = self.search(cr, uid, [], order='date_start, name')
+    for p in self.browse(cr, uid, period_ids):
+      self.write(cr, uid, [p.id], {'number': int(datetime.datetime.strptime(p.date_start, '%Y-%m-%d').strftime('%m'))})
+      self.action_set_state(cr, uid, period_ids, {'state': 'draft'})
+-
   Initially purchase order is in the draft state.
 -
   !assert {model: purchase.order, id: purchase_order_po0}:

=== modified file 'sale/test/data_test.yml'
--- sale/test/data_test.yml	2011-01-14 00:11:01 +0000
+++ sale/test/data_test.yml	2013-12-03 16:42:19 +0000
@@ -286,3 +286,12 @@
     type: product
     uom_id: product.product_uom_unit
     uom_po_id: product.product_uom_unit
+-
+  I overwrite periods with right number and open them
+-
+  !python {model: account.period}: |
+    import datetime
+    period_ids = self.search(cr, uid, [], order='date_start, name')
+    for p in self.browse(cr, uid, period_ids):
+      self.write(cr, uid, [p.id], {'number': int(datetime.datetime.strptime(p.date_start, '%Y-%m-%d').strftime('%m'))})
+      self.action_set_state(cr, uid, period_ids, {'state': 'draft'})