openerp-dev-web team mailing list archive

["pso \(Open ERP\)" <pso@xxxxxxxxxxx>]

pso (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #438717 Error in account_anglo_saxon when using foreign currency
  https://bugs.launchpad.net/bugs/438717
  #539539 product - VAT definition - multicompany
  https://bugs.launchpad.net/bugs/539539
  #589256 Wrong tax calculation in point of sale (POS)
  https://bugs.launchpad.net/bugs/589256
  #617974 trunk - hr payment - rounding issue payment slip
  https://bugs.launchpad.net/bugs/617974
  #646350 [trunk] sale analysis - wrong average price
  https://bugs.launchpad.net/bugs/646350
  #663585 [6.0rc1] suggested improvements to PO and SO form view
  https://bugs.launchpad.net/bugs/663585
  #663967 [RC1] SO -History - can delete related invoice
  https://bugs.launchpad.net/bugs/663967
  #666592 save and close crash adding product in point of sale
  https://bugs.launchpad.net/bugs/666592
  #669360 hr_timeeshet_sheet : installation fails on 1st (and probably last) date of the month.
  https://bugs.launchpad.net/bugs/669360
  #669533 [hr_timesheet] Employee timesheet reports confuse employee id and user id
  https://bugs.launchpad.net/bugs/669533
  #672684 Manual Global Tax
  https://bugs.launchpad.net/bugs/672684
  #673835 Sales, Purchase and Invoice Analysis Problem
  https://bugs.launchpad.net/bugs/673835
  #689924 [sale_margin] purchase price is wrong
  https://bugs.launchpad.net/bugs/689924
  #691810 Cannot cancel invoice BUG
  https://bugs.launchpad.net/bugs/691810
  #692456 Sale Order Reference not unique
  https://bugs.launchpad.net/bugs/692456
  #692735 [6.0] sales - canceled SO should not be black (normal)
  https://bugs.launchpad.net/bugs/692735
  #692964 in hr_recruitment, add a column "Subject" in applicants list view
  https://bugs.launchpad.net/bugs/692964
  #692976 expenses list shouldn't be editable
  https://bugs.launchpad.net/bugs/692976
  #693788 payroll compute sheet error
  https://bugs.launchpad.net/bugs/693788
  #694107 Point of Sale Journals credits customer debtor account instead of product's income accounts (v6rc1)
  https://bugs.launchpad.net/bugs/694107
  #694876 [6.0] dashboard finance - company analysis - P&L accounts seems to use data of all periods/fy
  https://bugs.launchpad.net/bugs/694876
  #697672 Wrong label for interview request state
  https://bugs.launchpad.net/bugs/697672
  #697691 Missing "Analytic Account" column in view "Timesheet by Account"
  https://bugs.launchpad.net/bugs/697691
  #697704 Not possible to select real employees when printing "Timesheet Profit" report
  https://bugs.launchpad.net/bugs/697704

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/pso-dev-addons3/+merge/45342

Hello,

Fixed https://bugs.launchpad.net/openobject-addons/+bug/697704.
For that, I have improved view, field and rml of timesheet profit report.

Thanks,
pso (Open ERP)
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/pso-dev-addons3/+merge/45342
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_timesheet_invoice/report/account_analytic_profit.rml'
--- hr_timesheet_invoice/report/account_analytic_profit.rml	2010-12-30 09:58:09 +0000
+++ hr_timesheet_invoice/report/account_analytic_profit.rml	2011-01-06 10:46:15 +0000
@@ -176,7 +176,7 @@
     <blockTable colWidths="159.0,62.0,63.0,68.0,65.0,53.0,52.0" style="Table_Header_Employee">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Employee or Journal Name</para>
+          <para style="terp_tblheader_Details">User or Journal Name</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Units</para>

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py	2010-12-30 09:58:09 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py	2011-01-06 10:46:15 +0000
@@ -30,7 +30,7 @@
         'date_from': fields.date('From', required=True),
         'date_to': fields.date('To', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'analytic_profit_journal_rel', 'analytic_id', 'journal_id', 'Journal', required=True),
-        'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'Employee', required=True),
+        'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'User', required=True),
                 }
 
     def _date_from(*a):

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml'
--- hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml	2010-12-30 09:58:09 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml	2011-01-06 10:46:15 +0000
@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Timesheet Profit">
-					<group height="400" width="480">
-						<group col="4" colspan="6">
+					<group height="420" width="370">
+						<group col="4" colspan="4">
 							<field name="date_from"/>
 							<field name="date_to"/>
                             <separator string="Journals" colspan="4"/>
 							<field name="journal_ids" colspan="4" nolabel="1"/>
-                            <separator string="Employees" colspan="4"/>
+                            <separator string="Users" colspan="4"/>
 							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>