Merge lp:~vauxoo/addons-vauxoo/account_analytic_analysis_rent_fix_date_format_dev_ernesto into lp:~vauxoo/addons-vauxoo/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
=== modified file 'account_analytic_analysis_rent/report/account_analytic_analysis_report.py'
--- account_analytic_analysis_rent/report/account_analytic_analysis_report.py 2013-08-27 22:23:35 +0000
+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.py 2013-08-29 23:54:20 +0000
@@ -18,7 +18,7 @@
18# along with this program. If not, see <http://www.gnu.org/licenses/>.18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#19#
20##############################################################################20##############################################################################
2121import locale
22import time22import time
23from report import report_sxw23from report import report_sxw
24from osv import osv24from osv import osv
@@ -32,6 +32,7 @@
32 'type_payment' : self._type_payment,32 'type_payment' : self._type_payment,
33 'get_data_features' : self._get_data_features,33 'get_data_features' : self._get_data_features,
34 'get_type_features' : self._get_type_features,34 'get_type_features' : self._get_type_features,
35 'locale_date' : self._locale_date,
35 })36 })
36 def _accesory(self,product_id):37 def _accesory(self,product_id):
37 if product_id.type == 'accesory':38 if product_id.type == 'accesory':
@@ -54,6 +55,9 @@
54 if product_id == obj_features.product_line_id.id:55 if product_id == obj_features.product_line_id.id:
55 return self._type_payment(obj_features)56 return self._type_payment(obj_features)
56 return []57 return []
58 def _locale_date(self):
59 locale.setlocale( locale.LC_TIME, 'es_MX.UTF-8' )
60 return time.strftime('%B %Y')
5761
58report_sxw.report_sxw('report.account.analytic.account.report','account.analytic.account','addons/account_analytic_analysis_rent/report/account_analytic_analysis_report.rml',62report_sxw.report_sxw('report.account.analytic.account.report','account.analytic.account','addons/account_analytic_analysis_rent/report/account_analytic_analysis_report.rml',
59 parser=account_analytic_account_report, header=False)63 parser=account_analytic_account_report, header=False)
6064
=== modified file 'account_analytic_analysis_rent/report/account_analytic_analysis_report.rml'
--- account_analytic_analysis_rent/report/account_analytic_analysis_report.rml 2013-08-27 22:23:35 +0000
+++ account_analytic_analysis_rent/report/account_analytic_analysis_report.rml 2013-08-29 23:54:20 +0000
@@ -421,7 +421,7 @@
421 </td>421 </td>
422 </tr>422 </tr>
423 </blockTable>423 </blockTable>
424 <para style="P10">Tijuana, B.C., a [[time.strftime('%d')]] de [[time.strftime('%B %Y')]]</para>424 <para style="P10">Tijuana, B.C., a [[time.strftime('%d')]] de [[locale_date()]]</para>
425 <para style="P9">425 <para style="P9">
426 <font color="white"> </font>426 <font color="white"> </font>
427 </para>427 </para>

Subscribers

People subscribed via source and target branches

to all changes: