Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/trunk-addons29-jap into lp:openobject-addons

  1. trunk-addons29-jap
  2. Merge into trunk
Proposed by Jagdish Panchal (Open ERP)
Status: Work in progress
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-addons29-jap
Merge into: lp:openobject-addons
Diff against target: 650 lines (+109/-154)
11 files modified
account/account_invoice_view.xml (+2/-2)
account/report/account_general_ledger.rml (+45/-113)
account/report/account_print_overdue.rml (+1/-1)
account/wizard/account_invoice_refund.py (+1/-1)
account_followup/report/account_followup_report.xml (+1/-1)
account_voucher/voucher_sales_purchase_view.xml (+2/-2)
base_calendar/crm_meeting_view.xml (+6/-2)
event/event.py (+17/-12)
event/event_view.xml (+25/-10)
l10n_be_invoice_bba/invoice.py (+8/-9)
portal_event/event_view.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-addons29-jap
Reviewer Review Type Date Requested Status
Jignesh Rathod(OpenERP) (community) Needs Resubmitting
Mustufa Rangwala (Open ERP) (community) Needs Fixing
Review via email: mp+163286@code.launchpad.net

Description of the change

Hello sir,

Accounting:
  Improve in Overdue payments report set curruency symbol in total.
  Improve Sales Receipt and Purchase Receipts Total fields in editable view.
Events:
 Improve message for event kanvan view.
 Rename fields.

Thanks
JAP

To post a comment you must log in.
lp:~openerp-dev/openobject-addons/trunk-addons29-jap updated
8703. By Jignesh Rathod(OpenERP)

[MERGE] merge wuth latest trunk

Revision history for this message
Mustufa Rangwala (Open ERP) (mra-tinyerp) wrote :

Few points to fix:
- Revert line 28-31
- Email configuration tab is going to merge with email desc. in another task so you can revert it.

Regards,
Mustufa Rangwala

review: Needs Fixing
Reply
lp:~openerp-dev/openobject-addons/trunk-addons29-jap updated
8704. By Jignesh Rathod(OpenERP)

[IMP] Changes according to need fixing.

Revision history for this message
Jignesh Rathod(OpenERP) (jir-openerp) wrote :

Hello Sir ,

I have improve code according to your suggestion.

Thanks.

review: Needs Resubmitting
Reply
lp:~openerp-dev/openobject-addons/trunk-addons29-jap updated
8705. By Jignesh Rathod(OpenERP)

[IMP] Changes according to need fixing.

8706. By Jignesh Rathod(OpenERP)

[MERGE] merge with latest trunk

Unmerged revisions

8706. By Jignesh Rathod(OpenERP)

[MERGE] merge with latest trunk

8705. By Jignesh Rathod(OpenERP)

[IMP] Changes according to need fixing.

8704. By Jignesh Rathod(OpenERP)

[IMP] Changes according to need fixing.

8703. By Jignesh Rathod(OpenERP)

[MERGE] merge wuth latest trunk

8702. By Jagdish Panchal (Open ERP)

[IMP] Improve code for event kanban message

8701. By Jagdish Panchal (Open ERP)

[IMP] Improve code for kanban view message

8700. By Jagdish Panchal (Open ERP)

[MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-improve-addons29-psa

8699. By Jagdish Panchal (Open ERP)

[IMP] Improve code to show oder button when there is no maximum tickect define

8698. By Jagdish Panchal (Open ERP)

[MERGE] Merge with lp:~openerp-dev/openobject-addons/trunk-improve-addons29-psa

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/account_invoice_view.xml'
2--- account/account_invoice_view.xml 2013-04-22 15:34:49 +0000
3+++ account/account_invoice_view.xml 2013-05-31 11:15:21 +0000
4@@ -173,7 +173,7 @@
5 <field name="supplier_invoice_number"/>
6 <label for="reference_type"/>
7 <div>
8- <field name="reference_type" class="oe_inline oe_edit_only"/>
9+ <field name="reference_type" class="oe_inline"/>
10 <field name="reference" class="oe_inline"/>
11 </div>
12 </group>
13@@ -249,7 +249,7 @@
14 <page string="Other Info">
15 <group>
16 <group>
17- <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
18+ <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)" context="{'default_partner_id':partner_id}"/>
19 <field name="user_id"/>
20 <field name="name" invisible="1"/>
21 <field name="payment_term" widget="selection"/>
22
23=== modified file 'account/report/account_general_ledger.rml'
24--- account/report/account_general_ledger.rml 2012-06-13 09:06:00 +0000
25+++ account/report/account_general_ledger.rml 2013-05-31 11:15:21 +0000
26@@ -26,12 +26,9 @@
27 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
28 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
29 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
30+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
31 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
32 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
33- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
34- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
35- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
36- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
37 </blockTableStyle>
38 <blockTableStyle id="Table1">
39 <blockAlignment value="LEFT"/>
40@@ -77,12 +74,9 @@
41 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
42 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
43 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
44+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
45 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
46 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
47- <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
48- <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
49- <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
50- <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
51 <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
52 <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
53 <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
54@@ -227,6 +221,7 @@
55 <initialize>
56 <paraStyle name="all" alignment="justify"/>
57 </initialize>
58+ <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
59 <paraStyle name="Standard" fontName="Helvetica"/>
60 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
61 <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
62@@ -262,86 +257,12 @@
63 <images/>
64 </stylesheet>
65 <story>
66- <pto>
67- <pto_header>
68- <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
69- <tr>
70- <td>
71- <para style="terp_tblheader_Details">Date</para>
72- </td>
73- <td>
74- <para style="terp_tblheader_Details">JRNL</para>
75- </td>
76- <td>
77- <para style="terp_tblheader_Details">Partner</para>
78- </td>
79- <td>
80- <para style="terp_tblheader_Details_Centre">Ref</para>
81- </td>
82- <td>
83- <para style="terp_tblheader_Details_Centre">Move</para>
84- </td>
85- <td>
86- <para style="terp_tblheader_Details">Entry Label</para>
87- </td>
88- <td>
89- <para style="terp_tblheader_Details_Centre">Counterpart</para>
90- </td>
91- <td>
92- <para style="terp_tblheader_Details_Right">Debit</para>
93- </td>
94- <td>
95- <para style="terp_tblheader_Details_Right">Credit</para>
96- </td>
97- <td>
98- <para style="terp_tblheader_Details_Right">Balance</para>
99- </td>
100- </tr>
101- </blockTable>
102- <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
103- <tr>
104- <td>
105- <para style="terp_tblheader_Details">Date</para>
106- </td>
107- <td>
108- <para style="terp_tblheader_Details">JRNL</para>
109- </td>
110- <td>
111- <para style="terp_tblheader_Details">Partner</para>
112- </td>
113- <td>
114- <para style="terp_tblheader_Details_Centre">Ref</para>
115- </td>
116- <td>
117- <para style="terp_tblheader_Details_Centre">Move</para>
118- </td>
119- <td>
120- <para style="terp_tblheader_Details">Entry Label</para>
121- </td>
122- <td>
123- <para style="terp_tblheader_Details_Centre">Counterpart</para>
124- </td>
125- <td>
126- <para style="terp_tblheader_Details_Right">Debit</para>
127- </td>
128- <td>
129- <para style="terp_tblheader_Details_Right">Credit</para>
130- </td>
131- <td>
132- <para style="terp_tblheader_Details_Right">Balance</para>
133- </td>
134- <td>
135- <para style="terp_tblheader_Details_Right">Currency</para>
136- </td>
137- </tr>
138- </blockTable>
139- </pto_header>
140 <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
141 <para style="terp_header_Centre">General Ledger</para>
142 <para style="terp_default_8">
143 <font color="white"> </font>
144 </para>
145- <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
146+ <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table13">
147 <tr>
148 <td>
149 <para style="terp_tblheader_General_Centre">Chart of Accounts</para>
150@@ -360,7 +281,7 @@
151 </td>
152 </tr>
153 </blockTable>
154- <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
155+ <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table1">
156 <tr>
157 <td>
158 <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
159@@ -373,40 +294,40 @@
160 </td>
161 <td>
162 <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
163- <blockTable colWidths="58.0,58.0" style="Table2">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
164+ <blockTable colWidths="58.0,58.0" style="Table2">
165 <tr>
166 <td>
167- <para style="terp_tblheader_General_Centre">Start Date</para>
168+ <para style="terp_tblheader_General_Centre">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date</para>
169 </td>
170 <td>
171 <para style="terp_tblheader_General_Centre">End Date</para>
172 </td>
173 </tr>
174 </blockTable>
175- <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
176+ <blockTable colWidths="58.0,58.0" style="Table3">
177 <tr>
178 <td>
179- <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
180+ <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]]</para>
181 </td>
182 <td>
183 <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
184 </td>
185 </tr>
186 </blockTable>
187- <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
188+ <blockTable colWidths="58.0,58.0" style="Table4">
189 <tr>
190 <td>
191- <para style="terp_tblheader_General_Centre">Start Period</para>
192+ <para style="terp_tblheader_General_Centre">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period</para>
193 </td>
194 <td>
195 <para style="terp_tblheader_General_Centre">End Period</para>
196 </td>
197 </tr>
198 </blockTable>
199- <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
200+ <blockTable colWidths="58.0,58.0" style="Table5">
201 <tr>
202 <td>
203- <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
204+ <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]]</para>
205 </td>
206 <td>
207 <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
208@@ -425,10 +346,10 @@
209 <para style="terp_default_8">
210 <font color="white"> </font>
211 </para>
212- <blockTable colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
213+ <blockTable colWidths="40.0,28.0,48.0,36.0,49.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table7">
214 <tr>
215 <td>
216- <para style="terp_tblheader_Details">Date</para>
217+ <para style="terp_tblheader_Details">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] Date</para>
218 </td>
219 <td>
220 <para style="terp_tblheader_Details">JRNL</para>
221@@ -464,10 +385,10 @@
222 </blockTable>
223 <section>
224 <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
225- <blockTable rowHeights="0.55cm" colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
226+ <blockTable colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">
227 <tr>
228 <td>
229- <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
230+ <para style="terp_default_Bold_9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
231 </td>
232 <td>
233 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
234@@ -476,19 +397,19 @@
235 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
236 </td>
237 <td>
238- <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
239+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
240 </td>
241 <td>
242- <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account'),currency_obj=o.currency_id) or '' ]]</para>
243+ <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
244 </td>
245 </tr>
246 </blockTable>
247 <section>
248 <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
249- <blockTable rowHeights="0.55cm" colWidths="40.0,28.0,48.0,42.0,42.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
250+ <blockTable colWidths="40.0,28.0,48.0,36.0,49.0,48.0,28.0,57.0,57.0,74.0,74.0" style="Table9">
251 <tr>
252 <td>
253- <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
254+ <para style="terp_default_8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] [[ formatLang(line['ldate'],date=True) ]]</para>
255 </td>
256 <td>
257 <para style="terp_default_8">[[ line['lcode'] ]]</para>
258@@ -497,7 +418,7 @@
259 <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
260 </td>
261 <td>
262- <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
263+ <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
264 </td>
265 <td>
266 <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
267@@ -515,19 +436,19 @@
268 <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
269 </td>
270 <td>
271- <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]] </para>
272+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
273 </td>
274 <td>
275- <para style="terp_default_Right_8"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</font></para>
276+ <para style="P1">[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'])]] [[ line['currency_code'] or '']]</para>
277 </td>
278 </tr>
279 </blockTable>
280 </section>
281 </section>
282- <blockTable colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
283+ <blockTable colWidths="40.0,28.0,82.0,43.0,43.0,71.0,43.0,57.0,57.0,77.0" style="Table10">
284 <tr>
285 <td>
286- <para style="terp_tblheader_Details">Date</para>
287+ <para style="terp_tblheader_Details">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date</para>
288 </td>
289 <td>
290 <para style="terp_tblheader_Details">JRNL</para>
291@@ -560,10 +481,10 @@
292 </blockTable>
293 <section>
294 <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
295- <blockTable rowHeights="0.55cm" colWidths="349.0,57.0,57.0,77.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
296+ <blockTable colWidths="349.0,57.0,57.0,77.0" style="Table11">
297 <tr>
298 <td>
299- <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
300+ <para style="terp_default_Bold_9">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
301 </td>
302 <td>
303 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
304@@ -572,16 +493,16 @@
305 <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
306 </td>
307 <td>
308- <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
309+ <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
310 </td>
311 </tr>
312 </blockTable>
313 <section>
314 <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
315- <blockTable rowHeights="0.55cm" colWidths="40.0,28.0,82.0,42.0,42.0,71.0,42.0,57.0,57.0,77.0" style="Table6">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
316+ <blockTable colWidths="40.0,28.0,82.0,43.0,43.0,71.0,43.0,57.0,57.0,77.0" style="Table6">
317 <tr>
318 <td>
319- <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
320+ <para style="terp_default_8">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ formatLang(line['ldate'],date=True) ]]</para>
321 </td>
322 <td>
323 <para style="terp_default_8">[[ line['lcode'] ]]</para>
324@@ -590,7 +511,7 @@
325 <para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para>
326 </td>
327 <td>
328- <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
329+ <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
330 </td>
331 <td>
332 <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
333@@ -608,12 +529,23 @@
334 <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
335 </td>
336 <td>
337- <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
338+ <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
339 </td>
340 </tr>
341 </blockTable>
342+ <para style="terp_default_2">
343+ <font color="white"> </font>
344+ </para>
345 </section>
346 </section>
347- </pto>
348+ <para style="terp_default_8">
349+ <font color="white"> </font>
350+ </para>
351+ <para style="terp_default_8">
352+ <font color="white"> </font>
353+ </para>
354+ <para style="terp_default_8">
355+ <font color="white"> </font>
356+ </para>
357 </story>
358 </document>
359
360=== modified file 'account/report/account_general_ledger.sxw'
361Binary files account/report/account_general_ledger.sxw 2011-10-27 21:11:24 +0000 and account/report/account_general_ledger.sxw 2013-05-31 11:15:21 +0000 differ
362=== modified file 'account/report/account_print_overdue.rml'
363--- account/report/account_print_overdue.rml 2012-12-04 10:31:46 +0000
364+++ account/report/account_print_overdue.rml 2013-05-31 11:15:21 +0000
365@@ -245,7 +245,7 @@
366 </td>
367 </tr>
368 </blockTable>
369- <blockTable colWidths="244.0,71.0,62.0,132.0" style="Table4">
370+ <blockTable colWidths="244.0,71.0,75.0,120.0" style="Table4">
371 <tr>
372 <td>
373 <para style="terp_default_8">
374
375=== modified file 'account/wizard/account_invoice_refund.py'
376--- account/wizard/account_invoice_refund.py 2013-04-15 10:23:49 +0000
377+++ account/wizard/account_invoice_refund.py 2013-05-31 11:15:21 +0000
378@@ -147,7 +147,7 @@
379 refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description, journal_id, context=context)
380 refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
381 inv_obj.write(cr, uid, [refund.id], {'date_due': date,
382- 'check_total': inv.check_total})
383+ 'check_total': inv.check_total, 'origin': inv.number})
384 inv_obj.button_compute(cr, uid, refund_id)
385
386 created_inv.append(refund_id[0])
387
388=== modified file 'account_followup/report/account_followup_report.xml'
389--- account_followup/report/account_followup_report.xml 2012-12-04 10:31:46 +0000
390+++ account_followup/report/account_followup_report.xml 2013-05-31 11:15:21 +0000
391@@ -6,7 +6,7 @@
392 <field name="name">account_followup.stat.tree</field>
393 <field name="model">account_followup.stat</field>
394 <field name="arch" type="xml">
395- <tree string="Follow-up lines">
396+ <tree string="Follow-up lines" create="false">
397 <field name="partner_id"/>
398 <field name="date_move"/>
399 <field name="date_move_last"/>
400
401=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
402--- account_voucher/voucher_sales_purchase_view.xml 2013-05-14 11:52:13 +0000
403+++ account_voucher/voucher_sales_purchase_view.xml 2013-05-31 11:15:21 +0000
404@@ -110,7 +110,7 @@
405 name="compute_tax" string="(update)"
406 attrs="{'invisible': [('state','!=','draft')]}"/>
407 </div>
408- <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
409+ <field name="amount" nolabel="1" class="oe_subtotal_footer_separator"/>
410 </group>
411 <group>
412 <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
413@@ -283,7 +283,7 @@
414 name="compute_tax" string="(update)"
415 attrs="{'invisible': [('state','!=','draft')]}"/>
416 </div>
417- <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
418+ <field name="amount" nolabel="1" class="oe_subtotal_footer_separator"/>
419 </group>
420 </group>
421 </page>
422
423=== modified file 'base_calendar/crm_meeting_view.xml'
424--- base_calendar/crm_meeting_view.xml 2013-02-14 09:33:51 +0000
425+++ base_calendar/crm_meeting_view.xml 2013-05-31 11:15:21 +0000
426@@ -80,7 +80,7 @@
427 </page>
428 <page string="Options">
429 <group>
430- <group col="1">
431+ <group col="1" groups="base.group_no_one">
432 <group>
433 <field name="recurrency"/>
434 </group>
435@@ -234,12 +234,16 @@
436 <field name="arch" type="xml">
437 <search string="Search Meetings">
438 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
439+ <filter string="Public" domain="[('class','=','public')]"/>
440+ <filter string="Private" domain="[('class','=','private')]"/>
441 <field name="partner_ids"/>
442 <field name="categ_ids"/>
443 <field name="user_id"/>
444 <separator/>
445+ <group expand="0" string="Group By...">
446+ <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
447+ </group>
448 <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
449- <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
450 </search>
451 </field>
452 </record>
453
454=== modified file 'event/event.py'
455--- event/event.py 2013-04-15 10:23:49 +0000
456+++ event/event.py 2013-05-31 11:15:21 +0000
457@@ -78,6 +78,9 @@
458 return super(event_event, self).copy(cr, uid, id, default=default, context=context)
459
460 def button_draft(self, cr, uid, ids, context=None):
461+ registration = self.pool.get('event.registration')
462+ reg_ids = registration.search(cr, uid, [('event_id','in',ids)], context=context)
463+ registration.write(cr, uid, reg_ids, {'state': 'draft'}, context=context)
464 return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
465
466 def button_cancel(self, cr, uid, ids, context=None):
467@@ -102,7 +105,7 @@
468 for event in self.browse(cr, uid, ids, context=context):
469 available_seats = event.register_avail
470 if available_seats and no_of_registration > available_seats:
471- raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
472+ raise osv.except_osv(_('Warning!'),_("Only %d ticket(s) available!") % (available_seats))
473 elif available_seats == 0:
474 raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
475
476@@ -176,12 +179,12 @@
477 'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
478 'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
479 'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
480- 'register_max': fields.integer('Maximum Registrations', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
481- 'register_min': fields.integer('Minimum Registrations', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
482- 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
483+ 'register_max': fields.integer('Maximum Tickets', help="You can for each event define a maximum registration level. If you have too much registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
484+ 'register_min': fields.integer('Minimum Tickets', help="You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )", readonly=True, states={'draft': [('readonly', False)]}),
485+ 'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers',type='integer'),
486 'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
487- 'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
488- 'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'),
489+ 'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers',type='integer'),
490+ 'register_attended': fields.function(_get_register, string='# of Attendees', multi='register_numbers',type='integer', help="The actual number of people who attended the event."),
491 'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
492 'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
493 'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
494@@ -282,8 +285,8 @@
495 date_end = date_begin + timedelta(hours=1)
496 res['value'] = {'date_end': date_end.strftime("%Y-%m-%d %H:%M:%S")}
497 return res
498-
499-
500+
501+
502 class event_registration(osv.osv):
503 """Event Registration"""
504 _name= 'event.registration'
505@@ -291,8 +294,8 @@
506 _inherit = ['mail.thread', 'ir.needaction_mixin']
507 _columns = {
508 'id': fields.integer('ID'),
509- 'origin': fields.char('Source Document', size=124,readonly=True,help="Reference of the sales order which created the registration"),
510- 'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}),
511+ 'origin': fields.char('Source Document', size=124,readonly=True,help="Name of the sale order which create the registration"),
512+ 'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}),
513 'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
514 'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
515 'create_date': fields.datetime('Creation Date' , readonly=True),
516@@ -320,6 +323,9 @@
517 }
518 _order = 'name, create_date desc'
519
520+ _sql_constraints = [
521+ ('check_number', 'CHECK(nb_register > 0)', 'Wrong Number of Participants entry!'),
522+ ]
523 def do_draft(self, cr, uid, ids, context=None):
524 return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
525
526@@ -339,7 +345,6 @@
527 res = self.confirm_registration(cr, uid, ids, context=context)
528 self.mail_user(cr, uid, ids, context=context)
529 return res
530-
531 def button_reg_close(self, cr, uid, ids, context=None):
532 """ Close Registration
533 """
534@@ -401,5 +406,5 @@
535 d = self.onchange_contact_id(cr, uid, ids, addr, part, context)
536 data.update(d['value'])
537 return {'value': data}
538-
539+
540 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
541
542=== modified file 'event/event_view.xml'
543--- event/event_view.xml 2013-05-30 13:47:36 +0000
544+++ event/event_view.xml 2013-05-31 11:15:21 +0000
545@@ -225,29 +225,44 @@
546 <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
547 <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
548 <t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
549- <t t-if="record.register_avail.raw_value == 9999"><i>No ticket available.</i></t>
550- <t t-if="record.register_avail.raw_value != 9999">
551+ <t t-if="record.register_avail.raw_value != 9999 and record.state.raw_value == 'draft' or record.state.raw_value == 'confirm' and record.register_max.raw_value != 0">
552 <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
553 <i>
554 <t t-if="record.register_avail.raw_value > 1">tickets </t>
555 <t t-if="record.register_avail.raw_value lte 1">ticket </t>
556 available.
557- </i>
558- </t>
559+ </i><br/>
560+ <t t-if="record.state.raw_value == 'confirm'">
561+ <i>This event is confirmed.</i>
562+ </t>
563+ </t>
564+ <t t-if="record.state.raw_value == 'draft' and record.register_max.raw_value == 0">
565+ <i>Registrations are open.</i>
566+ </t>
567+ <t t-if="record.state.raw_value == 'confirm' and record.register_max.raw_value == 0">
568+ <i>This event is confirmed.</i>
569+ </t>
570+ <t t-if="record.state.raw_value == 'done'">
571+ <i>This event is finished.</i>
572+ </t>
573+ <t t-if="record.state.raw_value == 'cancel'">
574+ <i>This event is cancelled.</i>
575+ </t>
576+
577 </p>
578 <div groups="base.group_user,portal.group_portal">
579- <t t-if="record.register_avail.raw_value gt 0 and record.register_avail.raw_value lt 9999">
580+ <t t-if="record.register_avail.raw_value gt 0 and record.register_avail.raw_value lt 9999 or record.register_max.raw_value == 0">
581 <t t-if="!record.is_subscribed.raw_value">
582- <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
583+ <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="$('#btn_sub' +this.id).data('context',JSON.stringify({'ticket':this.value}))"/>
584 <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
585- <span >Subscribe</span>
586+ <span >Order</span>
587 </button>
588 </t>
589 </t>
590 <t t-if="record.is_subscribed.raw_value">
591 <button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
592- <span>Subscribed</span>
593- <span class="oe_unsubscribe">Unsubscribe</span>
594+ <span>Ordered</span>
595+ <span class="oe_unsubscribe">Cancel Order</span>
596 </button>
597 </t>
598 </div>
599@@ -288,7 +303,7 @@
600 <separator/>
601 <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
602 <separator/>
603- <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Upcoming events from today" />
604+ <filter icon="terp-go-today" string="Upcoming" name="upcoming" domain="[('date_begin','&gt;=', time.strftime('%%Y-%%m-%%d 00:00:00')),('state','not in',('cancel','done'))]" help="Upcoming events from today" />
605 <field name="type"/>
606 <field name="user_id"/>
607 <group expand="0" string="Group By...">
608
609=== modified file 'l10n_be_invoice_bba/invoice.py'
610--- l10n_be_invoice_bba/invoice.py 2012-12-06 14:56:32 +0000
611+++ l10n_be_invoice_bba/invoice.py 2013-05-31 11:15:21 +0000
612@@ -69,17 +69,16 @@
613 date_invoice, payment_term, partner_bank_id, company_id)
614 # reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
615 # _logger.warning('partner_id %s' % partner_id)
616- reference = False
617+ reference = False
618 reference_type = 'none'
619+ res_update = {}
620 if partner_id:
621- if (type == 'out_invoice'):
622- reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
623- if reference_type:
624- reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
625- res_update = {
626- 'reference_type': reference_type or 'none',
627- 'reference': reference,
628- }
629+ reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
630+ res_update['reference_type'] = reference_type or 'none'
631+ if reference_type:
632+ reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
633+ if reference:
634+ res_update['reference'] = reference
635 result['value'].update(res_update)
636 return result
637
638
639=== modified file 'portal_event/event_view.xml'
640--- portal_event/event_view.xml 2012-12-05 14:40:51 +0000
641+++ portal_event/event_view.xml 2013-05-31 11:15:21 +0000
642@@ -8,7 +8,7 @@
643 <field name="model">event.event</field>
644 <field name="inherit_id" ref="event.view_event_form"/>
645 <field name="arch" type="xml">
646- <xpath expr="//page[last()]" position="after">
647+ <xpath expr="//page[last()]" position="before">
648 <page string="Portal Settings" groups="base.group_user">
649 <group>
650 <field name="visibility"/>

Subscribers

People subscribed via source and target branches

to all changes: