diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-02 10:58:27 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-02 10:58:27 +0530 |
| commit | 2fdecf4717080ea98a514b67dedefc27d76c6727 (patch) | |
| tree | bb54dd0e81af0bbf999fee1110fecb9e507f51e1 /addons/hr_payroll | |
| parent | 9fe0f6fa83b84d0806359bdc2a3ae31dfb7e997a (diff) | |
| parent | 3d22bb8b55d48e5ee8226f023555f003288b157a (diff) | |
[MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl
Diffstat (limited to 'addons/hr_payroll')
28 files changed, 69 insertions, 69 deletions
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml index d5618fab3a0..c752a2ca3a4 100644 --- a/addons/hr_payroll/hr_payroll_data.xml +++ b/addons/hr_payroll/hr_payroll_data.xml @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> - + <record id="BASIC" model="hr.salary.rule.category"> <field name="name">Basic</field> <field name="code">BASIC</field> </record> - + <record id="ALW" model="hr.salary.rule.category"> <field name="name">Allowance</field> <field name="code">ALW</field> </record> - - <record id="DED" model="hr.salary.rule.category"> - <field name="name">Deduction</field> - <field name="code">DED</field> - </record> - + <record id="GROSS" model="hr.salary.rule.category"> <field name="name">Gross</field> <field name="code">GROSS</field> </record> - + + <record id="DED" model="hr.salary.rule.category"> + <field name="name">Deduction</field> + <field name="code">DED</field> + </record> + <record id="NET" model="hr.salary.rule.category"> <field name="name">Net</field> <field name="code">NET</field> </record> - + <record id="COMP" model="hr.salary.rule.category"> <field name="name">Company Contribution</field> <field name="code">COMP</field> </record> - + <record id="hr_rule_basic" model="hr.salary.rule"> <field name="name">Basic</field> <field name="sequence" eval="1"/> @@ -71,13 +71,13 @@ <field eval="[(6, 0, [ref('hr_rule_basic'), ref('hr_rule_taxable'),ref('hr_rule_net')])]" name="rule_ids"/> <field name="company_id" ref="base.main_company"/> </record> - + <!-- Decimal Precision --> - + <record forcecreate="True" id="decimal_payroll" model="decimal.precision"> <field name="name">Payroll</field> <field name="digits">2</field> </record> - + </data> </openerp> diff --git a/addons/hr_payroll/i18n/bg.po b/addons/hr_payroll/i18n/bg.po index 876d2197f37..2be785ccbc1 100644 --- a/addons/hr_payroll/i18n/bg.po +++ b/addons/hr_payroll/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/ca.po b/addons/hr_payroll/i18n/ca.po index b9f99332af3..23fc7e0529f 100644 --- a/addons/hr_payroll/i18n/ca.po +++ b/addons/hr_payroll/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po index 71e82beb5db..6d60dedc7b1 100644 --- a/addons/hr_payroll/i18n/de.po +++ b/addons/hr_payroll/i18n/de.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/en_GB.po b/addons/hr_payroll/i18n/en_GB.po index c3978125d56..02da1ce1583 100644 --- a/addons/hr_payroll/i18n/en_GB.po +++ b/addons/hr_payroll/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po index acd665f6557..116153cabaf 100644 --- a/addons/hr_payroll/i18n/es.po +++ b/addons/hr_payroll/i18n/es.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/es_EC.po b/addons/hr_payroll/i18n/es_EC.po index c159cb14ec1..8fabfb9dcb2 100644 --- a/addons/hr_payroll/i18n/es_EC.po +++ b/addons/hr_payroll/i18n/es_EC.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/et.po b/addons/hr_payroll/i18n/et.po index d08ae4c44f8..e26fb680e50 100644 --- a/addons/hr_payroll/i18n/et.po +++ b/addons/hr_payroll/i18n/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/fi.po b/addons/hr_payroll/i18n/fi.po index c2e6993d8b0..e9c3268d0a7 100644 --- a/addons/hr_payroll/i18n/fi.po +++ b/addons/hr_payroll/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po index cf6650627c8..d690ae4d209 100644 --- a/addons/hr_payroll/i18n/fr.po +++ b/addons/hr_payroll/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/gl.po b/addons/hr_payroll/i18n/gl.po index 0d0ee343b8e..bb971b073e2 100644 --- a/addons/hr_payroll/i18n/gl.po +++ b/addons/hr_payroll/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po index d5ef3ff7d0f..0ecc8e489b0 100644 --- a/addons/hr_payroll/i18n/hr.po +++ b/addons/hr_payroll/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/hu.po b/addons/hr_payroll/i18n/hu.po index e7dab807ce8..a7b93f3f936 100644 --- a/addons/hr_payroll/i18n/hu.po +++ b/addons/hr_payroll/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/id.po b/addons/hr_payroll/i18n/id.po index 15c6e558d4c..ddf6aade539 100644 --- a/addons/hr_payroll/i18n/id.po +++ b/addons/hr_payroll/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/it.po b/addons/hr_payroll/i18n/it.po index 2ddef533166..706867494c8 100644 --- a/addons/hr_payroll/i18n/it.po +++ b/addons/hr_payroll/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/lo.po b/addons/hr_payroll/i18n/lo.po index 3b68936f323..7f365dab810 100644 --- a/addons/hr_payroll/i18n/lo.po +++ b/addons/hr_payroll/i18n/lo.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po index 8c6c044f033..2645cc11b43 100644 --- a/addons/hr_payroll/i18n/mn.po +++ b/addons/hr_payroll/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po index dd7f19f4489..128ba4f370a 100644 --- a/addons/hr_payroll/i18n/nl.po +++ b/addons/hr_payroll/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po index 96d913cf255..db418dbe02d 100644 --- a/addons/hr_payroll/i18n/pl.po +++ b/addons/hr_payroll/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po index 89c0a4621a2..9acb8069375 100644 --- a/addons/hr_payroll/i18n/pt.po +++ b/addons/hr_payroll/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/pt_BR.po b/addons/hr_payroll/i18n/pt_BR.po index 2ca091e22fa..32c3209cee2 100644 --- a/addons/hr_payroll/i18n/pt_BR.po +++ b/addons/hr_payroll/i18n/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/ru.po b/addons/hr_payroll/i18n/ru.po index a6e16d85f8f..60e7ac3bf7e 100644 --- a/addons/hr_payroll/i18n/ru.po +++ b/addons/hr_payroll/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/sr.po b/addons/hr_payroll/i18n/sr.po index 6dfa5696331..a7536f90c6a 100644 --- a/addons/hr_payroll/i18n/sr.po +++ b/addons/hr_payroll/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/sr@latin.po b/addons/hr_payroll/i18n/sr@latin.po index e207f907337..c21d0ec1f14 100644 --- a/addons/hr_payroll/i18n/sr@latin.po +++ b/addons/hr_payroll/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po index 0fb68461958..64b7acda746 100644 --- a/addons/hr_payroll/i18n/sv.po +++ b/addons/hr_payroll/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/tr.po b/addons/hr_payroll/i18n/tr.po index 00598d2e0dc..0a0c5d96c8e 100644 --- a/addons/hr_payroll/i18n/tr.po +++ b/addons/hr_payroll/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po index fa8f8faf4fe..973cd0602e4 100644 --- a/addons/hr_payroll/i18n/vi.po +++ b/addons/hr_payroll/i18n/vi.po @@ -9,13 +9,13 @@ msgstr "" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" "PO-Revision-Date: 2011-07-20 09:43+0000\n" -"Last-Translator: Phong Nguyen-Thanh <Unknown>\n" +"Last-Translator: OpenBMS JSC <Unknown>\n" "Language-Team: Vietnamese <vi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po index 5703d8c8903..35d36dc67ed 100644 --- a/addons/hr_payroll/i18n/zh_CN.po +++ b/addons/hr_payroll/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2011-10-19 05:39+0000\n" +"X-Generator: Launchpad (build 14157)\n" #. module: hr_payroll #: report:employees.salary:0 |
