Commits · 418d9e8aee4aa7f424741c1330a6432ac0107666 · Joshua / erp5

An error occurred fetching the project authors.

19 Feb, 2010 1 commit

2010-02-19 yusei · 418d9e8a

Yusei Tahara authored 15 years ago

* Move base_amount/payroll and base_amount/payroll/l10n categories to erp5_payroll.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32835 20353a03-c40f-0410-a6d1-a30d3c3de9de

418d9e8a

12 Jan, 2010 1 commit

- initiate 5.4.6 development · 4b88dc96

Łukasz Nowak authored 15 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31707 20353a03-c40f-0410-a6d1-a30d3c3de9de

4b88dc96

11 Jan, 2010 1 commit

add missing categories · d2e18369

Aurel authored 15 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31687 20353a03-c40f-0410-a6d1-a30d3c3de9de

d2e18369

10 Jan, 2010 1 commit

- synchronise business template version to 5.4.5 · 08a20fa5

Łukasz Nowak authored 15 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31670 20353a03-c40f-0410-a6d1-a30d3c3de9de

08a20fa5

04 Jan, 2010 1 commit

2010-01-04 aurel · d27fe335

Aurel authored 15 years ago

Update the bt to use the new structure of the base amount category :

- update local part of the base amount category

- update odt reports to use the new category structure

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31559 20353a03-c40f-0410-a6d1-a30d3c3de9de

d27fe335

16 Sep, 2009 1 commit
- fix problems related to category change (tax_category -> contribution_share) · 3e41afa7
  Fabien Morin authored 15 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29074 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  3e41afa7
01 Sep, 2009 1 commit

2009-09-01 yusuke · bf22132d

Yusuke Muraoka authored 15 years ago

* tax_category category is renamed to contribution_share category

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28711 20353a03-c40f-0410-a6d1-a30d3c3de9de

bf22132d

09 Jul, 2009 1 commit
- getEffectiveModel call was not good since the parameter changes. Update all calls · 2019f88f
  Fabien Morin authored 15 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28038 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  2019f88f
07 Jul, 2009 1 commit

don't get Description from Model dependence tree but only from paysheet. If... · b5de8e3b

Fabien Morin authored 15 years ago

don't get Description from Model dependence tree but only from paysheet. If nothing is found, nothing is displayed

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27997 20353a03-c40f-0410-a6d1-a30d3c3de9de

b5de8e3b

11 Jun, 2009 1 commit

fix a bug · 6623db6e

Fabien Morin authored 15 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27533 20353a03-c40f-0410-a6d1-a30d3c3de9de

6623db6e

01 Apr, 2009 1 commit
- multiplied tax amount by -1 to display positive results on the payslip · bc540b09
  Fabien Morin authored 15 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26237 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  bc540b09
17 Mar, 2009 1 commit

update some scripts : · e653f790

Fabien Morin authored 15 years ago

- typo
- fix some problems in PaySheetTransaction_getYearToDateSlice

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26070 20353a03-c40f-0410-a6d1-a30d3c3de9de

e653f790

16 Mar, 2009 1 commit

use new method from PaySheetModel class · 45dad6fe

Fabien Morin authored 15 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26054 20353a03-c40f-0410-a6d1-a30d3c3de9de

45dad6fe

12 Mar, 2009 2 commits

oups... a typo was in the previous commit · aa56f4ae

Fabien Morin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26008 20353a03-c40f-0410-a6d1-a30d3c3de9de

aa56f4ae

add two new base amount, update a title, and xml · 99288796

Fabien Morin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26006 20353a03-c40f-0410-a6d1-a30d3c3de9de

99288796

11 Mar, 2009 2 commits

add a new category, update xml · 6fb2e463

Fabien Morin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25989 20353a03-c40f-0410-a6d1-a30d3c3de9de

6fb2e463

add a new category · eaeb5aae

Fabien Morin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25986 20353a03-c40f-0410-a6d1-a30d3c3de9de

eaeb5aae

10 Mar, 2009 4 commits

fix some casse problems · 4e2f77ae

Fabien Morin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25962 20353a03-c40f-0410-a6d1-a30d3c3de9de

4e2f77ae

improve AsODT files to be able to display more lines on the page · 76cfbfaa
Fabien Morin authored 16 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25949 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
76cfbfaa

revert the category change · 6d50f2b4

Fabien Morin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25943 20353a03-c40f-0410-a6d1-a30d3c3de9de

6d50f2b4

2009-03-10 fabien · 0c9323c3

Fabien Morin authored 16 years ago

* rename salaire_net_imposabe base_amount into taxable_net_pay
* add a macro used to display localised information in a part of the payslip
* increment version number because of the new style of the payslip

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25934 20353a03-c40f-0410-a6d1-a30d3c3de9de

0c9323c3

04 Feb, 2009 2 commits
- add a new base_amount used for intermediate line of CSG french tax · ae9367e6
  Fabien Morin authored 16 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25444 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  ae9367e6
- remove the short title because it has non sens in france · 50f20763
  Fabien Morin authored 16 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25443 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  50f20763
28 Jan, 2009 1 commit

2009-01-28 fabien · ecee78ff

Fabien Morin authored 16 years ago

* add salaire_net_imposable base_amount category

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25327 20353a03-c40f-0410-a6d1-a30d3c3de9de

ecee78ff

15 Jan, 2009 2 commits

add a condition to return None if the slice is not found · 576c3283
Fabien Morin authored 16 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25134 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
576c3283

update bt format · 5f980105

Fabien Morin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25133 20353a03-c40f-0410-a6d1-a30d3c3de9de

5f980105

13 Jun, 2008 2 commits

it's no longer needed to create a line with the sum of employee tax for · 10ea8d0d

Jérome Perrin authored 16 years ago

accounting. This is good news because this line was not updated when some
paysheet lines were changed manually.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21593 20353a03-c40f-0410-a6d1-a30d3c3de9de

10ea8d0d

pay_sheet_transaction_builder is in erp5_payroll · 9f68b291

Jérome Perrin authored 16 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21592 20353a03-c40f-0410-a6d1-a30d3c3de9de

9f68b291

28 Mar, 2008 1 commit
- pass good parameters to PaySheetTransaction_postCalculation · c2191538
  Jérome Perrin authored 16 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20199 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  c2191538
06 Mar, 2008 1 commit
- remove base_amount/over_time, as a category base_amount/overtime now exists in erp5_payroll · 76c959de
  Jérome Perrin authored 17 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19740 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  76c959de
24 Jan, 2008 1 commit

2008-01-24 fabien · 30fbf6e0

Fabien Morin authored 17 years ago

* add version number

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18846 20353a03-c40f-0410-a6d1-a30d3c3de9de

30fbf6e0

23 Jan, 2008 1 commit

put the category base_amount/base_tax_prevoyance in the nexedi_payroll bt... · ad686784

Fabien Morin authored 17 years ago

put the category base_amount/base_tax_prevoyance  in the nexedi_payroll bt because this category is used only in nexedi_payroll calculation scripts

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18845 20353a03-c40f-0410-a6d1-a30d3c3de9de

ad686784

07 Jan, 2008 1 commit

the slice amount will not be used on PaySheet who don't have any model in the... · 0052b8ae

Fabien Morin authored 17 years ago

the slice amount will not be used on PaySheet who don't have any model in the YearToDateSlice script.
This case must not appear very often. Just on the old PaySheet (before or during the Upgrade). During the upgrade, a default model is set on the Pay Sheets.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18613 20353a03-c40f-0410-a6d1-a30d3c3de9de

0052b8ae

13 Dec, 2007 1 commit

change axe_list name into category_list · 684b7727

Fabien Morin authored 17 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18313 20353a03-c40f-0410-a6d1-a30d3c3de9de

684b7727

12 Dec, 2007 1 commit
- remove unused category from the script (now there is no slice for this payroll service) · 37788837
  Fabien Morin authored 17 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18265 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  37788837
10 Dec, 2007 1 commit
- - invert salary_range and tax_category order because of changes the PayrollService_view. · 897379fd
  Fabien Morin authored 17 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18157 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  897379fd
06 Dec, 2007 1 commit

add over_time base_amount category · 532d3521

Fabien Morin authored 17 years ago

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18081 20353a03-c40f-0410-a6d1-a30d3c3de9de

532d3521

04 Dec, 2007 2 commits
- add portal_deliveries/pay_sheet_transaction_builder script to generate PaySheetTransactionLine · 1d2a0aea
  Fabien Morin authored 17 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18008 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  1d2a0aea
- initial import of all the files of the bt · a9651d0e
  Fabien Morin authored 17 years ago
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17993 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
  a9651d0e