Commits · 438ca7ecc2e35d22e212684b8d5e7952fc6ff3a5 · nexedi / erp5

18 Apr, 2008 15 commits

tax and discount calculation with a script or a fixed price doesn't work yet. Disable it for now. · 438ca7ec
Jérome Perrin authored Apr 18, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20666 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
438ca7ec

Jérome Perrin authored Apr 18, 2008

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

432b2c83

Bump to 5.0. · b8c2126d

Yoshinori Okuji authored Apr 18, 2008

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

b8c2126d

fix portal types · edc79947

Jérome Perrin authored Apr 18, 2008

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

edc79947

Add missing base_contribution_list in OrderLine_view · 20216b3b
Jérome Perrin authored Apr 18, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20662 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
20216b3b

Bump to 5.0. · c67a9c1c

Yoshinori Okuji authored Apr 18, 2008

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

c67a9c1c

revise r20572, invoice print belongs to invoicing, not accounting · 06a17400
Jérome Perrin authored Apr 18, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20648 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
06a17400

fix dialog name · c6b33d5f

Jérome Perrin authored Apr 18, 2008

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

c6b33d5f

revise r20572, invoice print belongs to invoicing, not accounting · 71d8ad5a
Jérome Perrin authored Apr 18, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20644 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
71d8ad5a
Use _ViewEmulator in _setCacheHeaders, as it expects an action, not an object · 1b05b014
Alexandre Boeglin authored Apr 18, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20643 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
1b05b014

add an action letting managers view all transactions · 9130216d

Aurel authored Apr 18, 2008

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

9130216d

use a threading.local for SEARCH_KEY_INSTANCE_POOL · c46302e0

Jérome Perrin authored Apr 18, 2008



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

c46302e0

Keep discount_type category · 53d4eaab

Jérome Perrin authored Apr 18, 2008

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

53d4eaab

Implement good editor page (should have been committed earlier) · eb06e294
Jean-Paul Smets authored Apr 18, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20638 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
eb06e294

Only use getObject if needed. · d2153773

Jean-Paul Smets authored Apr 18, 2008

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

d2153773

17 Apr, 2008 25 commits

update invoice simulation test, we now generate in started state · 02d029b2

Jérome Perrin authored Apr 17, 2008

test that if the order contains line when applying TC, tax is calculated for those lines
start test for discounts

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

02d029b2

Order_applyTradeCondition: · 7a9c9690

Jérome Perrin authored Apr 17, 2008

* copy payment condition recursivly from all trade conditions
* initialize discount line
* immediatly calculate discount / tax line if the order already contains some movements when the trade condition is applied

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

7a9c9690

revert r20631 I was wrong · 4d571ac4

Jérome Perrin authored Apr 17, 2008

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

4d571ac4

update allowed types and views for new discount management · f60261bc
Jérome Perrin authored Apr 17, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20633 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
f60261bc
Invoice Transaction Lines are now generated in started state · 5a8010e6
Jérome Perrin authored Apr 17, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20631 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
5a8010e6

missing action · e156a100

Jérome Perrin authored Apr 17, 2008

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

e156a100

add validation state fields on Tax & Discount · 95082923

Jérome Perrin authored Apr 17, 2008

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

95082923

set edit_workflow and validation_workflow on Tax & Discount · fea8962d
Jérome Perrin authored Apr 17, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20628 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
fea8962d

Comment property sheet is set on the class · 7a5704f2

Jérome Perrin authored Apr 17, 2008

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

7a5704f2

left by previous commit · 62a5ad17

Jérome Perrin authored Apr 17, 2008

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

62a5ad17

check quantity unit title · e5f494ab

Aurel authored Apr 17, 2008


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

e5f494ab

display translated unit title in report · 0d88a967

Aurel authored Apr 17, 2008

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

0d88a967

check order report · 896dea5c

Aurel authored Apr 17, 2008


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

896dea5c

* Add new discount system, similar to new tax system: · c3e8d4c3

Jérome Perrin authored Apr 17, 2008

- Discount are the resource (in discount module)
- Trade Condition contains Discount Model Line
- Delivery contains Discount Line

(also apply some minor fixes to Tax* forms)

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

c3e8d4c3

remove strong dependancy, this is a mistake · 1dedb58d

Alexandre Boeglin authored Apr 17, 2008

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

1dedb58d

* fix comment · 9045604c

Alexandre Boeglin authored Apr 17, 2008

* make strong dependancy to erp5_pdm 1.0rc6 to prevent breaking sites at upgrade

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

9045604c

forgot to actually push version number, add comment · d0e3036b
Alexandre Boeglin authored Apr 17, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20617 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
d0e3036b

better selection name · 44e885d4

Jérome Perrin authored Apr 17, 2008


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

44e885d4

Packing List only contain Packing List Line and Container Line, but no... · 2ef5bd3c

Jérome Perrin authored Apr 17, 2008

Packing List only contain Packing List Line and Container Line, but no Discount or Payment Conditions

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

2ef5bd3c

update test, now that Tax Rule is always applied · a734a33f

Jérome Perrin authored Apr 17, 2008


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

a734a33f

don't test the rule, it's an heavy computation, and rather useless · e17b06bf
Jérome Perrin authored Apr 17, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20613 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
e17b06bf
Use portal_contribution_registry instead of content_type_registry · fbb51462
Yusei Tahara authored Apr 17, 2008
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20612 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
fbb51462

2008-04-17 yusei · 469e76f1

Yusei Tahara authored Apr 17, 2008

* Revise version to 5.0.

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

469e76f1

2008-4-17 yusei · 9f5422da

Yusei Tahara authored Apr 17, 2008

* Revise version to 5.0.

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

9f5422da

2008-4-17 yusei · 7ae0dc67

Yusei Tahara authored Apr 17, 2008

* Turned on acquire local role for Internet Protocol Address portal type.

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

7ae0dc67