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

[Jagdish Panchal (Open ERP)]

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

[lp:~openerp-dev/openobject-addons/trunk-addons29-jap]

8703. By Jignesh Rathod(OpenERP) on 2013-05-27

[MERGE] merge wuth latest trunk

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

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

[lp:~openerp-dev/openobject-addons/trunk-addons29-jap]

8704. By Jignesh Rathod(OpenERP) on 2013-05-29

[IMP] Changes according to need fixing.

[Jignesh Rathod(OpenERP) (jir-openerp)]

Hello Sir ,

I have improve code according to your suggestion.

Thanks.

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-addons29-jap]

8705. By Jignesh Rathod(OpenERP) on 2013-05-29

[IMP] Changes according to need fixing.

8706. By Jignesh Rathod(OpenERP) on 2013-05-31

[MERGE] merge with latest trunk

Unmerged revisions

8706. By Jignesh Rathod(OpenERP) on 2013-05-31

[MERGE] merge with latest trunk

8705. By Jignesh Rathod(OpenERP) on 2013-05-29

[IMP] Changes according to need fixing.

8704. By Jignesh Rathod(OpenERP) on 2013-05-29

[IMP] Changes according to need fixing.

8703. By Jignesh Rathod(OpenERP) on 2013-05-27

[MERGE] merge wuth latest trunk

8702. By Jagdish Panchal (Open ERP) on 2013-05-10

[IMP] Improve code for event kanban message

8701. By Jagdish Panchal (Open ERP) on 2013-05-10

[IMP] Improve code for kanban view message

8700. By Jagdish Panchal (Open ERP) on 2013-05-09

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

8699. By Jagdish Panchal (Open ERP) on 2013-05-09

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

8698. By Jagdish Panchal (Open ERP) on 2013-05-08

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

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-04-22 15:34:49 +0000
+++ account/account_invoice_view.xml	2013-05-31 11:15:21 +0000
@@ -173,7 +173,7 @@
                             <field name="supplier_invoice_number"/>
                             <label for="reference_type"/>
                             <div>
-                                <field name="reference_type" class="oe_inline oe_edit_only"/>
+                                <field name="reference_type" class="oe_inline"/>
                                 <field name="reference" class="oe_inline"/>
                             </div>
                         </group>
@@ -249,7 +249,7 @@
                         <page string="Other Info">
                             <group>
                                 <group>
-                                    <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
+                                    <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)" context="{'default_partner_id':partner_id}"/>
                                     <field name="user_id"/>
                                     <field name="name" invisible="1"/>
                                     <field name="payment_term" widget="selection"/>
 
=== modified file 'account/report/account_general_ledger.rml'
--- account/report/account_general_ledger.rml	2012-06-13 09:06:00 +0000
+++ account/report/account_general_ledger.rml	2013-05-31 11:15:21 +0000
@@ -26,12 +26,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -77,12 +74,9 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="11,0" stop="11,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="11,-1" stop="11,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="12,0" stop="12,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="12,0" stop="12,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="13,0" stop="13,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="13,0" stop="13,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="13,-1" stop="13,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,1" stop="0,1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -227,6 +221,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -262,86 +257,12 @@
     <images/>
   </stylesheet>
   <story>
-  	<pto>
-  	<pto_header>
-  		<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') ]]
-	      <tr>
-	        <td>
-	          <para style="terp_tblheader_Details">Date</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">JRNL</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Partner</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Ref</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Move</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Entry Label</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Debit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Credit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Balance</para>
-	        </td>
-	      </tr>
-	    </blockTable>
-	    <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')]]
-	      <tr>
-	        <td>
-	          <para style="terp_tblheader_Details">Date</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">JRNL</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Partner</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Ref</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Move</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details">Entry Label</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Centre">Counterpart</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Debit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Credit</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Balance</para>
-	        </td>
-	        <td>
-	          <para style="terp_tblheader_Details_Right">Currency</para>
-	        </td>
-	      </tr>
-	    </blockTable>
-  	</pto_header>
     <para style="terp_default_8">[[ repeatIn(objects, 'a') ]]</para>
     <para style="terp_header_Centre">General Ledger</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table13">
+    <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table13">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Chart of Accounts</para>
@@ -360,7 +281,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="102.0,102.0,102.0,130.0,102.0" style="Table1">
+    <blockTable colWidths="82.0,82.0,82.0,169.0,123.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ get_account(data) or '' ]]</para>
@@ -373,40 +294,40 @@
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
-          <blockTable colWidths="58.0,58.0" style="Table2">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table2">
             <tr>
               <td>
-                <para style="terp_tblheader_General_Centre">Start Date</para>
+                <para style="terp_tblheader_General_Centre">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date</para>
               </td>
               <td>
                 <para style="terp_tblheader_General_Centre">End Date</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table3">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table3">
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ formatLang(get_start_date(data),date=True) ]]</para>
+                <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_8">[[ formatLang(get_end_date(data),date=True) ]]</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table4">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table4">
             <tr>
               <td>
-                <para style="terp_tblheader_General_Centre">Start Period</para>
+                <para style="terp_tblheader_General_Centre">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period</para>
               </td>
               <td>
                 <para style="terp_tblheader_General_Centre">End Period</para>
               </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="58.0,58.0" style="Table5">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]]
+          <blockTable colWidths="58.0,58.0" style="Table5">
             <tr>
               <td>
-                <para style="terp_default_Centre_8">[[ get_start_period(data) or removeParentNode('para') ]]</para>
+                <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]]</para>
               </td>
               <td>
                 <para style="terp_default_Centre_8">[[ get_end_period(data) or removeParentNode('para') ]]</para>
@@ -425,10 +346,10 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <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')]]
+    <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">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
+          <para style="terp_tblheader_Details">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] Date</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">JRNL</para>
@@ -464,10 +385,10 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <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')]]
+      <blockTable colWidths="278.0,57.0,57.0,74.0,74.0" style="Table8">
         <tr>
           <td>
-            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_9">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
@@ -476,19 +397,19 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <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>
+            <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>
           </td>
         </tr>
       </blockTable>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <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')]]
+        <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">
           <tr>
             <td>
-              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+              <para style="terp_default_8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]] [[ formatLang(line['ldate'],date=True) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ line['lcode'] ]]</para>
@@ -497,7 +418,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],10) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
@@ -515,19 +436,19 @@
               <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]] </para>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
             </td>
             <td>
-              <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>
+              <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>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <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') ]]
+    <blockTable colWidths="40.0,28.0,82.0,43.0,43.0,71.0,43.0,57.0,57.0,77.0" style="Table10">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Date</para>
+          <para style="terp_tblheader_Details">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] Date</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">JRNL</para>
@@ -560,10 +481,10 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
-      <blockTable rowHeights="0.55cm" colWidths="349.0,57.0,57.0,77.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="349.0,57.0,57.0,77.0" style="Table11">
         <tr>
           <td>
-            <para style="terp_default_Bold_9"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_9">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ '..'*(o.level-1) ]] [[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
@@ -572,16 +493,16 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o), 'line') ]]</para>
-        <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') ]]
+        <blockTable colWidths="40.0,28.0,82.0,43.0,43.0,71.0,43.0,57.0,57.0,77.0" style="Table6">
           <tr>
             <td>
-              <para style="terp_default_8">[[ formatLang(line['ldate'],date=True) ]]</para>
+              <para style="terp_default_8">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]] [[ formatLang(line['ldate'],date=True) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ line['lcode'] ]]</para>
@@ -590,7 +511,7 @@
               <para style="terp_default_8">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
-              <para style="terp_default_8">[[ line['lref'] and strip_name(line['lref'],9) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['lref'],9) ]]</para>
             </td>
             <td>
               <para style="terp_default_8">[[ strip_name(line['move'],9) ]]</para>
@@ -608,12 +529,23 @@
               <para style="terp_default_Right_8">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account'),currency_obj=company.currency_id) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
+        <para style="terp_default_2">
+          <font color="white"> </font>
+        </para>
       </section>
     </section>
-    </pto>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
 
=== modified file 'account/report/account_general_ledger.sxw'
 Binary 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
=== modified file 'account/report/account_print_overdue.rml'
--- account/report/account_print_overdue.rml	2012-12-04 10:31:46 +0000
+++ account/report/account_print_overdue.rml	2013-05-31 11:15:21 +0000
@@ -245,7 +245,7 @@
         </td>
       </tr>
       </blockTable>
-      <blockTable colWidths="244.0,71.0,62.0,132.0" style="Table4">
+      <blockTable colWidths="244.0,71.0,75.0,120.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_8">
 
=== modified file 'account/wizard/account_invoice_refund.py'
--- account/wizard/account_invoice_refund.py	2013-04-15 10:23:49 +0000
+++ account/wizard/account_invoice_refund.py	2013-05-31 11:15:21 +0000
@@ -147,7 +147,7 @@
                 refund_id = inv_obj.refund(cr, uid, [inv.id], date, period, description, journal_id, context=context)
                 refund = inv_obj.browse(cr, uid, refund_id[0], context=context)
                 inv_obj.write(cr, uid, [refund.id], {'date_due': date,
-                                                'check_total': inv.check_total})
+                                                'check_total': inv.check_total, 'origin': inv.number})
                 inv_obj.button_compute(cr, uid, refund_id)
 
                 created_inv.append(refund_id[0])
 
=== modified file 'account_followup/report/account_followup_report.xml'
--- account_followup/report/account_followup_report.xml	2012-12-04 10:31:46 +0000
+++ account_followup/report/account_followup_report.xml	2013-05-31 11:15:21 +0000
@@ -6,7 +6,7 @@
             <field name="name">account_followup.stat.tree</field>
             <field name="model">account_followup.stat</field>
             <field name="arch" type="xml">
-                <tree string="Follow-up lines">
+                <tree string="Follow-up lines" create="false">
                     <field name="partner_id"/>
                     <field name="date_move"/>
                     <field name="date_move_last"/>
 
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml	2013-05-14 11:52:13 +0000
+++ account_voucher/voucher_sales_purchase_view.xml	2013-05-31 11:15:21 +0000
@@ -110,7 +110,7 @@
                                             name="compute_tax" string="(update)"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
 			                        </div>
-                                    <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
+                                    <field name="amount" nolabel="1" class="oe_subtotal_footer_separator"/>
                                 </group>                                    
 			                    <group>
                                     <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
@@ -283,7 +283,7 @@
                                             name="compute_tax" string="(update)"
                                             attrs="{'invisible': [('state','!=','draft')]}"/>
 			            </div>
-                                    <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
+                                    <field name="amount" nolabel="1" class="oe_subtotal_footer_separator"/>
                                 </group>
                             </group>
                         </page>
 
=== modified file 'base_calendar/crm_meeting_view.xml'
--- base_calendar/crm_meeting_view.xml	2013-02-14 09:33:51 +0000
+++ base_calendar/crm_meeting_view.xml	2013-05-31 11:15:21 +0000
@@ -80,7 +80,7 @@
                     </page>
                     <page string="Options">
                         <group>
-                            <group col="1">
+                            <group col="1" groups="base.group_no_one">
                                 <group>
                                     <field name="recurrency"/>
                                 </group>
@@ -234,12 +234,16 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
+                <filter string="Public" domain="[('class','=','public')]"/>
+                <filter string="Private" domain="[('class','=','private')]"/>
                 <field name="partner_ids"/>
                 <field name="categ_ids"/>
                 <field name="user_id"/>
                 <separator/>
+                <group expand="0" string="Group By...">
+                    <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                </group>
                 <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
-                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
             </search>
         </field>
     </record>
 
=== modified file 'event/event.py'
--- event/event.py	2013-04-15 10:23:49 +0000
+++ event/event.py	2013-05-31 11:15:21 +0000
@@ -78,6 +78,9 @@
         return super(event_event, self).copy(cr, uid, id, default=default, context=context)
 
     def button_draft(self, cr, uid, ids, context=None):
+        registration = self.pool.get('event.registration')
+        reg_ids = registration.search(cr, uid, [('event_id','in',ids)], context=context)
+        registration.write(cr, uid, reg_ids, {'state': 'draft'}, context=context)
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
@@ -102,7 +105,7 @@
         for event in self.browse(cr, uid, ids, context=context):
             available_seats = event.register_avail
             if available_seats and no_of_registration > available_seats:
-                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+                raise osv.except_osv(_('Warning!'),_("Only %d ticket(s) available!") % (available_seats))
             elif available_seats == 0:
                 raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
 
@@ -176,12 +179,12 @@
         'name': fields.char('Name', size=64, required=True, translate=True, readonly=False, states={'done': [('readonly', True)]}),
         'user_id': fields.many2one('res.users', 'Responsible User', readonly=False, states={'done': [('readonly', True)]}),
         'type': fields.many2one('event.type', 'Type of Event', readonly=False, states={'done': [('readonly', True)]}),
-        '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)]}),
-        '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)]}),
-        'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers'),
+        '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)]}),
+        '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)]}),
+        'register_current': fields.function(_get_register, string='Confirmed Registrations', multi='register_numbers',type='integer'),
         'register_avail': fields.function(_get_register, string='Available Registrations', multi='register_numbers',type='integer'),
-        'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers'),
-        'register_attended': fields.function(_get_register, string='# of Participations', multi='register_numbers'),
+        'register_prospect': fields.function(_get_register, string='Unconfirmed Registrations', multi='register_numbers',type='integer'),
+        'register_attended': fields.function(_get_register, string='# of Attendees', multi='register_numbers',type='integer', help="The actual number of people who attended the event."),
         'registration_ids': fields.one2many('event.registration', 'event_id', 'Registrations', readonly=False, states={'done': [('readonly', True)]}),
         'date_begin': fields.datetime('Start Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_end': fields.datetime('End Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -282,8 +285,8 @@
             date_end = date_begin + timedelta(hours=1)
             res['value'] = {'date_end': date_end.strftime("%Y-%m-%d %H:%M:%S")}
         return res
-
-
+    
+    
 class event_registration(osv.osv):
     """Event Registration"""
     _name= 'event.registration'
@@ -291,8 +294,8 @@
     _inherit = ['mail.thread', 'ir.needaction_mixin']
     _columns = {
         'id': fields.integer('ID'),
-        'origin': fields.char('Source Document', size=124,readonly=True,help="Reference of the sales order which created the registration"),
-        'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'origin': fields.char('Source Document', size=124,readonly=True,help="Name of the sale order which create the registration"),
+        'nb_register': fields.integer('Quantity', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
         'create_date': fields.datetime('Creation Date' , readonly=True),
@@ -320,6 +323,9 @@
     }
     _order = 'name, create_date desc'
 
+    _sql_constraints = [
+        ('check_number', 'CHECK(nb_register > 0)', 'Wrong Number of Participants entry!'),
+    ]
     def do_draft(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
@@ -339,7 +345,6 @@
         res = self.confirm_registration(cr, uid, ids, context=context)
         self.mail_user(cr, uid, ids, context=context)
         return res
-
     def button_reg_close(self, cr, uid, ids, context=None):
         """ Close Registration
         """
@@ -401,5 +406,5 @@
             d = self.onchange_contact_id(cr, uid, ids, addr, part, context)
             data.update(d['value'])
         return {'value': data}
-
+        
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'event/event_view.xml'
--- event/event_view.xml	2013-05-30 13:47:36 +0000
+++ event/event_view.xml	2013-05-31 11:15:21 +0000
@@ -225,29 +225,44 @@
                               <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
                               <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
                               <t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
-                              <t t-if="record.register_avail.raw_value == 9999"><i>No ticket available.</i></t>
-                              <t t-if="record.register_avail.raw_value != 9999">
+                              <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">
                                 <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
                                 <i>
                                     <t t-if="record.register_avail.raw_value > 1">tickets </t>
                                     <t t-if="record.register_avail.raw_value lte 1">ticket </t>
                                     available.
-                                </i>
-                              </t>
+                                </i><br/>
+	                              <t t-if="record.state.raw_value == 'confirm'">
+	                                <i>This event is confirmed.</i>
+	                              </t>                                
+                              </t>
+                              <t t-if="record.state.raw_value == 'draft' and record.register_max.raw_value == 0">
+                                <i>Registrations are open.</i>
+                              </t> 
+                              <t t-if="record.state.raw_value == 'confirm' and record.register_max.raw_value == 0">
+                                <i>This event is confirmed.</i>
+                              </t>                                                             
+                              <t t-if="record.state.raw_value == 'done'">
+                                <i>This event is finished.</i>
+                              </t>
+                              <t t-if="record.state.raw_value == 'cancel'">
+                                <i>This event is cancelled.</i>
+                              </t>
+
                             </p>
                             <div groups="base.group_user,portal.group_portal">
-                                <t t-if="record.register_avail.raw_value gt 0 and record.register_avail.raw_value lt 9999">
+                                <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">
                                   <t t-if="!record.is_subscribed.raw_value">
-                                    <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}))"/>
+                                    <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}))"/>
                                     <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
-                                        <span >Subscribe</span>
+                                        <span >Order</span>
                                     </button>
                                   </t>
                                 </t>
                                 <t t-if="record.is_subscribed.raw_value">
                                   <button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
-                                    <span>Subscribed</span>
-                                    <span class="oe_unsubscribe">Unsubscribe</span>
+                                    <span>Ordered</span>
+                                    <span class="oe_unsubscribe">Cancel Order</span>
                                   </button>
                                 </t>
                             </div>
@@ -288,7 +303,7 @@
                     <separator/>
                     <filter icon="terp-personal" string="My Events" help="My Events" domain="[('user_id','=',uid)]"/>
                     <separator/>
-                    <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" />
+                    <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" />
                     <field name="type"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
 
=== modified file 'l10n_be_invoice_bba/invoice.py'
--- l10n_be_invoice_bba/invoice.py	2012-12-06 14:56:32 +0000
+++ l10n_be_invoice_bba/invoice.py	2013-05-31 11:15:21 +0000
@@ -69,17 +69,16 @@
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
 #        _logger.warning('partner_id %s' % partner_id)
-        reference = False
+        reference = False        
         reference_type = 'none'
+        res_update = {}
         if partner_id:
-            if (type == 'out_invoice'):
-                reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
-                if reference_type:
-                    reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
-        res_update = {
-            'reference_type': reference_type or 'none',
-            'reference': reference,
-        }
+            reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
+            res_update['reference_type'] = reference_type or 'none'
+            if reference_type:
+                reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
+                if reference:
+                    res_update['reference'] = reference
         result['value'].update(res_update)
         return result
 
 
=== modified file 'portal_event/event_view.xml'
--- portal_event/event_view.xml	2012-12-05 14:40:51 +0000
+++ portal_event/event_view.xml	2013-05-31 11:15:21 +0000
@@ -8,7 +8,7 @@
             <field name="model">event.event</field>
             <field name="inherit_id" ref="event.view_event_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[last()]" position="after">
+                <xpath expr="//page[last()]" position="before">
                     <page string="Portal Settings" groups="base.group_user">
                         <group>
                             <field name="visibility"/>