Unifield Server

Merge lp:~julie-w/unifield-server/US-3801 into lp:unifield-server

  1. US-3801
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4849
Proposed branch: lp:~julie-w/unifield-server/US-3801
Merge into: lp:unifield-server
Diff against target: 119 lines (+24/-5) (has conflicts)
6 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+13/-0)
bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+1/-1)
bin/addons/register_accounting/account_bank_statement.py (+2/-0)
bin/addons/register_accounting/account_view.xml (+4/-2)
bin/addons/register_accounting/report/bank_reconciliation.rml (+2/-1)
bin/addons/register_accounting/report/cash_inventory.rml (+2/-1)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3801
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+342663@code.launchpad.net
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 'bin/addons/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2018-03-20 10:40:57 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2018-04-04 15:24:48 +0000
4@@ -107492,6 +107492,7 @@
5 #, python-format
6 msgid "The account %s - %s cannot be used as Account Payable."
7 msgstr "Le compte %s - %s ne peut pas être utilisé comme Compte Fournisseur."
8+<<<<<<< TREE
9
10 #. module: account_mcdb
11 #: field:account.mcdb,display_mcdb_load_button:0
12@@ -107519,3 +107520,15 @@
13 #, python-format
14 msgid "You have to load the template first."
15 msgstr "Vous devez d'abord charger le modèle."
16+=======
17+
18+#. module: register_accounting
19+#: field:account.bank.statement,register_closed_by:0
20+msgid "Register Closed by"
21+msgstr "Registre Fermé par"
22+
23+#. module: register_accounting
24+#: help:account.bank.statement,register_closed_by:0
25+msgid "Name and position of the person who closes the register"
26+msgstr "Nom et poste de la personne qui ferme le registre"
27+>>>>>>> MERGE-SOURCE
28
29=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
30--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2018-03-15 14:46:24 +0000
31+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2018-04-04 15:24:48 +0000
32@@ -66,7 +66,7 @@
33 msf_sync_data_server.expatriate_employees_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Tree,Valid,,332
34 msf_sync_data_server.expatriate_employees_coach,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,"[('coach_id', '!=', '')]",['coach_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Coach,Valid,,334
35 msf_sync_data_server.local_employees,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,"[('employee_type','=','local'),('name','!=','Administrator')]","['birthday', 'code', 'cost_center_id/id', 'destination_id/id', 'employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone']",HQ + MISSION,hr.employee,,Local Employees,Valid,"{'active': False}",335
36-msf_sync_data_server.register,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['balance_end_real', 'balance_start', 'closing_date', 'comments', 'date', 'instance_id/id', 'journal_id/id', 'name', 'notes', 'open_advance_amount', 'period_id/id','closing_balance_frozen','closing_balance_frozen_date','unrecorded_expenses_amount']",MISSION,account.bank.statement,instance_id,Register,Valid,,400
37+msf_sync_data_server.register,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['balance_end_real', 'balance_start', 'closing_date', 'comments', 'date', 'instance_id/id', 'journal_id/id', 'name', 'notes', 'open_advance_amount', 'period_id/id','closing_balance_frozen','closing_balance_frozen_date','unrecorded_expenses_amount', 'register_closed_by']",MISSION,account.bank.statement,instance_id,Register,Valid,,400
38 msf_sync_data_server.register_line,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['account_id/id', 'amount_in', 'amount_out', 'analytic_distribution_id/id', 'cheque_number', 'date', 'direct_invoice', 'direct_state', 'document_date', 'employee_id/id', 'instance_id/id', 'name', 'note', 'partner_id/id', 'reconciled', 'ref', 'sequence', 'statement_id/id', 'transfer_amount','transfer_journal_id/id', 'type', 'from_cash_return']",MISSION,account.bank.statement.line,instance_id,Register Line,Valid,,401
39 msf_sync_data_server.register_cashbox_line_starting,TRUE,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('starting_id','in',('account.bank.statement','id',[('state','!=','draft')])),('starting_id', '!=', ''),('ending_id', '=', '')]","['instance_id/id', 'number', 'pieces', 'starting_id/id']",MISSION,account.cashbox.line,instance_id,Register Cashbox Line (starting),Valid,,402
40 msf_sync_data_server.register_status,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['instance_id/id', 'state']",MISSION,account.bank.statement,instance_id,Register Status,Valid,,403
41
42=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
43--- bin/addons/register_accounting/account_bank_statement.py 2018-03-28 09:49:33 +0000
44+++ bin/addons/register_accounting/account_bank_statement.py 2018-04-04 15:24:48 +0000
45@@ -207,6 +207,8 @@
46 'responsible_ids': fields.many2many('res.users', 'bank_statement_users_rel', 'statement_id', 'user_id', 'Responsible'),
47 'bank_account_number': fields.related('journal_id', 'bank_account_number', type='char',
48 string='Bank Account Number', store=False, readonly=True),
49+ 'register_closed_by': fields.char('Register Closed by', size=128, states={'confirm': [('readonly', True)]},
50+ help='Name and position of the person who closes the register'),
51 }
52
53 _order = 'state asc, period_number asc'
54
55=== modified file 'bin/addons/register_accounting/account_view.xml'
56--- bin/addons/register_accounting/account_view.xml 2018-03-05 15:04:25 +0000
57+++ bin/addons/register_accounting/account_view.xml 2018-04-04 15:24:48 +0000
58@@ -175,7 +175,8 @@
59 </page>
60 </notebook>
61 <separator string="Comments"/>
62- <field name="notes" nolabel="1"/>
63+ <field name="notes" nolabel="1" colspan="4"/>
64+ <field name="register_closed_by"/>
65 <separator string="Dates"/>
66 <group col="6" colspan="4">
67 <field name="date" string="Opening Date" select="1" on_change="onchange_date(date)" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
68@@ -396,7 +397,8 @@
69 </group>
70 </group>
71 <separator string="Comments"/>
72- <field name="notes" nolabel="1"/>
73+ <field name="notes" nolabel="1" colspan="4"/>
74+ <field name="register_closed_by"/>
75 <separator string="State" />
76 <group name="state" colspan="4">
77 <field name="state" colspan="4" readonly="True"/>
78
79=== modified file 'bin/addons/register_accounting/report/bank_reconciliation.rml'
80--- bin/addons/register_accounting/report/bank_reconciliation.rml 2017-10-24 16:12:56 +0000
81+++ bin/addons/register_accounting/report/bank_reconciliation.rml 2018-04-04 15:24:48 +0000
82@@ -41,6 +41,7 @@
83 <paraStyle name="center" alignment="CENTER"/>
84 <paraStyle name="text" leftIndent="3mm"/>
85 <paraStyle name="text_right" rightIndent="3mm" alignment="RIGHT"/>
86+ <paraStyle name="medium_text" fontName="Helvetica" fontSize="9" alignment="LEFT"/>
87 </stylesheet>
88
89 <story>
90@@ -121,7 +122,7 @@
91
92 <blockTable colWidths="120mm, 60mm" style="table_sign">
93 <tr>
94- <td></td>
95+ <td><para style="medium_text">[[ o.register_closed_by or '' ]]</para></td>
96 <td></td>
97 </tr>
98 <tr>
99
100=== modified file 'bin/addons/register_accounting/report/cash_inventory.rml'
101--- bin/addons/register_accounting/report/cash_inventory.rml 2018-01-02 13:35:19 +0000
102+++ bin/addons/register_accounting/report/cash_inventory.rml 2018-04-04 15:24:48 +0000
103@@ -52,6 +52,7 @@
104 <paraStyle name="center" alignment="CENTER"/>
105 <paraStyle name="text" leftIndent="3mm"/>
106 <paraStyle name="text_right" rightIndent="3mm" alignment="RIGHT"/>
107+ <paraStyle name="medium_text" fontName="Helvetica" fontSize="9" alignment="LEFT"/>
108 </stylesheet>
109
110 <story>
111@@ -168,7 +169,7 @@
112 <spacer length="5"/>
113 <blockTable colWidths="120mm, 60mm" style="table_sign">
114 <tr>
115- <td></td>
116+ <td><para style="medium_text">[[ o.register_closed_by or '' ]]</para></td>
117 <td></td>
118 </tr>
119 <tr>

Subscribers

People subscribed via source and target branches