Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/account_analytic_analysis_rent_fix_date_format_dev_ernesto into lp:~vauxoo/addons-vauxoo/rico_contract_dev_rodo

  1. account_analytic_analysis_rent_fix_date_format_dev_ernesto
  2. Merge into rico_contract_dev_rodo
Status: Merged
Merged at revision: 634
Proposed branch: lp:~vauxoo/addons-vauxoo/account_analytic_analysis_rent_fix_date_format_dev_ernesto
Merge into: lp:~vauxoo/addons-vauxoo/rico_contract_dev_rodo
Diff against target: 43 lines (+6/-2)
2 files modified
account_analytic_analysis_rent/report/account_analytic_analysis_report.py (+5/-1)
account_analytic_analysis_rent/report/account_analytic_analysis_report.rml (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/account_analytic_analysis_rent_fix_date_format_dev_ernesto
Reviewer Review Type Date Requested Status
Luis Ernesto García Medina - http://www.vauxoo.com Pending
Rodolfo Lopez Pending
Review via email: mp+183060@code.launchpad.net

Description of the change

Rodo ya quedo arreglado el formato de la fecha puedes checar por favor

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_analytic_analysis_rent/report/account_analytic_analysis_report.py'
2--- account_analytic_analysis_rent/report/account_analytic_analysis_report.py 2013-08-27 22:23:35 +0000
3+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.py 2013-08-29 23:54:20 +0000
4@@ -18,7 +18,7 @@
5 # along with this program. If not, see <http://www.gnu.org/licenses/>.
6 #
7 ##############################################################################
8-
9+import locale
10 import time
11 from report import report_sxw
12 from osv import osv
13@@ -32,6 +32,7 @@
14 'type_payment' : self._type_payment,
15 'get_data_features' : self._get_data_features,
16 'get_type_features' : self._get_type_features,
17+ 'locale_date' : self._locale_date,
18 })
19 def _accesory(self,product_id):
20 if product_id.type == 'accesory':
21@@ -54,6 +55,9 @@
22 if product_id == obj_features.product_line_id.id:
23 return self._type_payment(obj_features)
24 return []
25+ def _locale_date(self):
26+ locale.setlocale( locale.LC_TIME, 'es_MX.UTF-8' )
27+ return time.strftime('%B %Y')
28
29 report_sxw.report_sxw('report.account.analytic.account.report','account.analytic.account','addons/account_analytic_analysis_rent/report/account_analytic_analysis_report.rml',
30 parser=account_analytic_account_report, header=False)
31
32=== modified file 'account_analytic_analysis_rent/report/account_analytic_analysis_report.rml'
33--- account_analytic_analysis_rent/report/account_analytic_analysis_report.rml 2013-08-27 22:23:35 +0000
34+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.rml 2013-08-29 23:54:20 +0000
35@@ -421,7 +421,7 @@
36 </td>
37 </tr>
38 </blockTable>
39- <para style="P10">Tijuana, B.C., a [[time.strftime('%d')]] de [[time.strftime('%B %Y')]]</para>
40+ <para style="P10">Tijuana, B.C., a [[time.strftime('%d')]] de [[locale_date()]]</para>
41 <para style="P9">
42 <font color="white"> </font>
43 </para>

Subscribers

People subscribed via source and target branches

to all changes: