openerp-dev-web team mailing list archive

["Purnendu Singh \(OpenERP\)" <psi@xxxxxxxxxxxxx>]

Purnendu Singh (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #568537 The __compute method of account_account needs optmization to improve Accounting Performance!
  https://bugs.launchpad.net/bugs/568537
  #588776 Error when closing fiscal year
  https://bugs.launchpad.net/bugs/588776
  #686508 Not able to validate sales receipt
  https://bugs.launchpad.net/bugs/686508
  #686513 Not able to validate supplier vouchers
  https://bugs.launchpad.net/bugs/686513
  #691218 add an employee to a department
  https://bugs.launchpad.net/bugs/691218
  #692139 Account Journal onchange_type method context undefined error
  https://bugs.launchpad.net/bugs/692139
  #692962 In hr contract, shouldn't be able to enter an end date lower than a start date
  https://bugs.launchpad.net/bugs/692962
  #693476 [6.0] sale manager dashboard - "Sales by Customer" - incomplete
  https://bugs.launchpad.net/bugs/693476
  #693810 [RC1]Pay button when you pay directly in Sales receipt form
  https://bugs.launchpad.net/bugs/693810
  #694937 [6.0] account entry analysis - unreconciled does not filter 
  https://bugs.launchpad.net/bugs/694937
  #695439 membership: can't open members via GTK client
  https://bugs.launchpad.net/bugs/695439
  #697207 Bug when sending followups without specifying any email address
  https://bugs.launchpad.net/bugs/697207
  #697714 Unclear warning on cancel opening entries
  https://bugs.launchpad.net/bugs/697714
  #702027 [trunk]hr_payroll minor typos
  https://bugs.launchpad.net/bugs/702027

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/46100
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2/+merge/46100
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-psi2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2011-01-03 09:08:25 +0000
+++ hr_payroll/hr_payroll.py	2011-01-13 08:03:02 +0000
@@ -661,8 +661,8 @@
     _name = 'hr.allounce.deduction.categoty'
     _description = 'Allowance Deduction Heads'
     _columns = {
-        'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
-        'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
+        'name':fields.char('Category Name', size=64, required=True, readonly=False),
+        'code':fields.char('Category Code', size=64, required=True, readonly=False),
         'type':fields.selection([
             ('allowance','Allowance'),
             ('deduction','Deduction'),
@@ -769,7 +769,7 @@
     """
 
     _name = 'company.contribution.line'
-    _description = 'Allowance Deduction Categoty'
+    _description = 'Allowance Deduction Category'
     _order = 'sequence'
     _columns = {
         'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),

=== modified file 'hr_payroll/hr_payroll_data.xml'
--- hr_payroll/hr_payroll_data.xml	2010-12-30 09:58:09 +0000
+++ hr_payroll/hr_payroll_data.xml	2011-01-13 08:03:02 +0000
@@ -4,14 +4,14 @@
         <record id="HRA" model="hr.allounce.deduction.categoty">
             <field name="code">HRA</field>
             <field name="type">allowance</field>
-            <field name="name">House Rant Allowance</field>
+            <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
         </record>
-        
+
         <record id="CA" model="hr.allounce.deduction.categoty">
             <field name="code">CA</field>
             <field name="type">allowance</field>
-            <field name="name">Convance Allowance</field>
+            <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
         </record>
         

=== modified file 'hr_payroll/hr_payroll_demo.xml'
--- hr_payroll/hr_payroll_demo.xml	2010-12-30 09:58:09 +0000
+++ hr_payroll/hr_payroll_demo.xml	2011-01-13 08:03:02 +0000
@@ -17,7 +17,7 @@
             <field name="type">allowance</field>
             <field name="category_id" ref="hr_payroll.HRA"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
-            <field name="name">House Rant Allowance</field>
+            <field name="name">House Rent Allowance</field>
         </record>
 
         <record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
@@ -28,7 +28,7 @@
             <field name="type">allowance</field>
             <field name="category_id" ref="hr_payroll.CA"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
-            <field name="name">Convance Allowance</field>
+            <field name="name">Conveyance Allowance</field>
         </record>
 
         <record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">

=== modified file 'hr_payroll/i18n/de.po'
--- hr_payroll/i18n/de.po	2011-01-10 12:09:24 +0000
+++ hr_payroll/i18n/de.po	2011-01-13 08:03:02 +0000
@@ -1032,7 +1032,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "Kategorie"
 
 #. module: hr_payroll
@@ -1422,7 +1422,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "Kategorie Bez."
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/es.po'
--- hr_payroll/i18n/es.po	2011-01-12 05:47:02 +0000
+++ hr_payroll/i18n/es.po	2011-01-13 08:03:02 +0000
@@ -1028,7 +1028,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "Código de categoría"
 
 #. module: hr_payroll
@@ -1408,7 +1408,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "Nombre categoría"
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/et.po'
--- hr_payroll/i18n/et.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/et.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/fr.po'
--- hr_payroll/i18n/fr.po	2011-01-10 04:35:24 +0000
+++ hr_payroll/i18n/fr.po	2011-01-13 08:03:02 +0000
@@ -1035,7 +1035,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "Code de catégorie"
 
 #. module: hr_payroll
@@ -1422,7 +1422,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "Nom de la catégorie"
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/hr.po'
--- hr_payroll/i18n/hr.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/hr.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/hr_payroll.pot'
--- hr_payroll/i18n/hr_payroll.pot	2011-01-11 12:18:32 +0000
+++ hr_payroll/i18n/hr_payroll.pot	2011-01-13 08:03:02 +0000
@@ -1009,7 +1009,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1383,7 +1383,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/hu.po'
--- hr_payroll/i18n/hu.po	2011-01-11 05:03:13 +0000
+++ hr_payroll/i18n/hu.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/it.po'
--- hr_payroll/i18n/it.po	2011-01-11 05:24:48 +0000
+++ hr_payroll/i18n/it.po	2011-01-13 08:03:02 +0000
@@ -1018,7 +1018,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1398,7 +1398,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/mn.po'
--- hr_payroll/i18n/mn.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/mn.po	2011-01-13 08:03:02 +0000
@@ -1026,7 +1026,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "Ангиллын код"
 
 #. module: hr_payroll
@@ -1412,7 +1412,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "Ангиллын нэр"
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/nl.po'
--- hr_payroll/i18n/nl.po	2011-01-11 05:03:13 +0000
+++ hr_payroll/i18n/nl.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/pl.po'
--- hr_payroll/i18n/pl.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/pl.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "Kod kategorii"
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "Nazwa kategorii"
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/pt.po'
--- hr_payroll/i18n/pt.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/pt.po	2011-01-13 08:03:02 +0000
@@ -1015,7 +1015,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "Código de categoria"
 
 #. module: hr_payroll
@@ -1395,7 +1395,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "Nome da categoria"
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/ru.po'
--- hr_payroll/i18n/ru.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/ru.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "Код категории"
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "Название категории"
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/sr@xxxxxxxx'
--- hr_payroll/i18n/sr@xxxxxxxx	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/sr@xxxxxxxx	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/sv.po'
--- hr_payroll/i18n/sv.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/sv.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

=== modified file 'hr_payroll/i18n/zh_CN.po'
--- hr_payroll/i18n/zh_CN.po	2011-01-06 07:52:12 +0000
+++ hr_payroll/i18n/zh_CN.po	2011-01-13 08:03:02 +0000
@@ -1014,7 +1014,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr "åˆ†ç±»ä»£ç "
 
 #. module: hr_payroll
@@ -1394,7 +1394,7 @@
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr "分类名"
 
 #. module: hr_payroll