Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master-rutuba-09072018' into 'master-patch-july-2018'

Browse Source 
Master rutuba 09072018

See merge request flectra-hq/flectra!109
This commit is contained in:
Parthiv Patel 2018-07-19 13:23:27 +00:00
commit de63417863
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/l10n_fr/data/account_chart_template_data.xml
View File

@ -1251,6 +1251,7 @@
<field name="name">Prêts participatifs</field>
<field name="code">2741</field>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="reconcile" eval="True"/>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
@ -1258,6 +1259,7 @@
<field name="name">Prêts aux associés</field>
<field name="code">2742</field>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="reconcile" eval="True"/>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
@ -1265,6 +1267,7 @@
<field name="name">Prêts au personnel</field>
<field name="code">2743</field>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="reconcile" eval="True"/>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
@ -1272,6 +1275,7 @@
<field name="name">Autres prêts</field>
<field name="code">2748</field>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="reconcile" eval="True"/>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
@ -1279,6 +1283,7 @@
<field name="name">Dépôts</field>
<field name="code">2751</field>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="reconcile" eval="True"/>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>
@ -1286,6 +1291,7 @@
<field name="name">Cautionnements</field>
<field name="code">2755</field>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="reconcile" eval="True"/>
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
</record>

4
addons/l10n_mx/data/account_tax_data.xml
View File

@ -18,6 +18,10 @@
<field name="name">DIOT: 16%</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_diot_16_non_cre" model="account.account.tag">
<field name="name">DIOT: 16% NO ACREDITABLE</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_diot_16_imp" model="account.account.tag">
<field name="name">DIOT: 16% IMP</field>
<field name="applicability">taxes</field>

2
addons/sales_team/models/crm_team.py
View File

@ -221,7 +221,7 @@ class CrmTeam(models.Model):
self.ensure_one()
values = []
today = date.today()
today = fields.Date.from_string(fields.Date.context_today(self))
start_date, end_date = self._graph_get_dates(today)
graph_data = self._graph_data(start_date, end_date)