pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to ab9b5a13e4

Browse Source
This commit is contained in:
Christophe Simonis
2017-10-26 17:47:49 +02:00
parent 9dee7d1e58 ab9b5a13e4
commit 7a03426826
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/google_calendar/models/google_calendar.py
+1 -1
View File
@@ -922,7 +922,7 @@ class GoogleCalendar(models.AbstractModel):
def get_minTime(self):
number_of_week = self.env['ir.config_parameter'].get_param('calendar.week_synchro', default=13)
return datetime.now() - timedelta(weeks=number_of_week)
return datetime.now() - timedelta(weeks=int(number_of_week))
def get_need_synchro_attendee(self):
return self.env['ir.config_parameter'].get_param('calendar.block_synchro_attendee', default=True)
addons/l10n_ca/data/account_chart_template_after_data.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<field name="property_account_payable_id" ref="chart2111_en"/>
<field name="property_account_income_categ_id" ref="chart411_en"/>
<field name="property_account_expense_categ_id" ref="chart5111_en"/>
<field name="property_stock_account_input_categ_id" ref="chart2141_en"/>
<field name="property_stock_account_input_categ_id" ref="chart2171_en"/>
<field name="property_stock_account_output_categ_id" ref="chart1145_en"/>
<field name="property_stock_valuation_account_id" ref="chart1141_en"/>
<field name="income_currency_exchange_account_id" ref="chart42_en"/>
addons/l10n_ca/data/l10n_ca_chart_data.xml
+1 -1
View File
@@ -217,7 +217,7 @@
<record id="chart2171_en" model="account.account.template">
<field name="code">2171</field>
<field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="name">Stock Received But Not Billed</field>
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
</record>
addons/l10n_fr_fec/wizard/account_fr_fec.py
+10 -4
View File
@@ -5,10 +5,12 @@
import base64
import csv
from datetime import datetime
import StringIO
from odoo import api, fields, models, _
from odoo.exceptions import Warning
from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
class AccountFrFec(models.TransientModel):
@@ -33,7 +35,7 @@ class AccountFrFec(models.TransientModel):
SELECT
'OUV' AS JournalCode,
'Balance initiale' AS JournalLib,
'Balance initiale PL' AS EcritureNum,
'OUVERTURE/' || %s AS EcritureNum,
%s AS EcritureDate,
'120/129' AS CompteNum,
'Benefice (perte) reporte(e)' AS CompteLib,
@@ -67,8 +69,10 @@ class AccountFrFec(models.TransientModel):
'''
company = self.env.user.company_id
formatted_date_from = self.date_from.replace('-', '')
date_from = datetime.strptime(self.date_from, DEFAULT_SERVER_DATE_FORMAT)
formatted_date_year = date_from.year
self._cr.execute(
sql_query, (formatted_date_from, formatted_date_from, formatted_date_from, self.date_from, company.id))
sql_query, (formatted_date_year, formatted_date_from, formatted_date_from, formatted_date_from, self.date_from, company.id))
listrow = []
row = self._cr.fetchone()
listrow = list(row)
@@ -130,7 +134,7 @@ class AccountFrFec(models.TransientModel):
SELECT
'OUV' AS JournalCode,
'Balance initiale' AS JournalLib,
'Balance initiale ' || MIN(aa.name) AS EcritureNum,
'OUVERTURE/' || %s AS EcritureNum,
%s AS EcritureDate,
MIN(aa.code) AS CompteNum,
replace(MIN(aa.name), '|', '/') AS CompteLib,
@@ -170,8 +174,10 @@ class AccountFrFec(models.TransientModel):
HAVING sum(aml.balance) != 0
'''
formatted_date_from = self.date_from.replace('-', '')
date_from = datetime.strptime(self.date_from, DEFAULT_SERVER_DATE_FORMAT)
formatted_date_year = date_from.year
self._cr.execute(
sql_query, (formatted_date_from, formatted_date_from, formatted_date_from, self.date_from, company.id))
sql_query, (formatted_date_year, formatted_date_from, formatted_date_from, formatted_date_from, self.date_from, company.id))
for row in self._cr.fetchall():
listrow = list(row)