Commits · 6ee725037c22e66e0df6cf84d84e18f12ed554e6 · nexedi / erp5

02 Aug, 2010 1 commit

Remove code that shouldn't have been merge in r37129 · 6ee72503

Julien Muchembled authored Aug 02, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37394 20353a03-c40f-0410-a6d1-a30d3c3de9de

6ee72503

15 Jul, 2010 2 commits

remove needless code that are added by sync with r37114. · 7e6ee97d

Kazuhiko Shiozaki authored Jul 15, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37131 20353a03-c40f-0410-a6d1-a30d3c3de9de

7e6ee97d

sync with trunk@37114 · c1ae57b0

Sebastien Robin authored Jul 15, 2010

Conflicts:
	bt5/erp5_base/bt/revision
	bt5/erp5_simulation/DocumentTemplateItem/InvoiceSimulationRule.py
	bt5/erp5_simulation/bt/revision
	bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Base_viewTradeFieldLibrary.xml
	bt5/erp5_trade/bt/change_log
	bt5/erp5_trade/bt/revision
	products/ERP5/Document/BusinessPath.py
	products/ERP5/Document/SimulationMovement.py
	products/ERP5/Document/TradeCondition.py
	products/ERP5/Document/TradeModelLine.py
	products/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/revision
	products/ERP5Type/ERP5Type.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37129 20353a03-c40f-0410-a6d1-a30d3c3de9de

c1ae57b0

13 Jul, 2010 4 commits

set trade_date category in the default Trade Model Path. · 63eb6ce0

Kazuhiko Shiozaki authored Jul 13, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37095 20353a03-c40f-0410-a6d1-a30d3c3de9de

63eb6ce0

remove heading 'trade_phase/' in comparison if exists. · f8dd1d93

Kazuhiko Shiozaki authored Jul 13, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37094 20353a03-c40f-0410-a6d1-a30d3c3de9de

f8dd1d93

Fixed typos in places not carefully reviewed · 71de63af

Jean-Paul Smets authored Jul 13, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37090 20353a03-c40f-0410-a6d1-a30d3c3de9de

71de63af

move to ERP5Legacy, because Business State is replaced by trade_state base category. · 2b51b73c
Kazuhiko Shiozaki authored Jul 13, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37089 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
2b51b73c

12 Jul, 2010 15 commits

fix a wrong usage of _getExplanationCache(). · c04548d4

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37062 20353a03-c40f-0410-a6d1-a30d3c3de9de

c04548d4

override stepCreateOrder() to set a business process as the specialise value. · 59d0ef7b
Kazuhiko Shiozaki authored Jul 12, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37061 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
59d0ef7b

fix more 'undefined name', but still remains some. · 361830d6

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37060 20353a03-c40f-0410-a6d1-a30d3c3de9de

361830d6

fix typos : business_link -> trade_model_path. · 46ac9720

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37059 20353a03-c40f-0410-a6d1-a30d3c3de9de

46ac9720

set trade_phase in rules. · a01c2962

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37058 20353a03-c40f-0410-a6d1-a30d3c3de9de

a01c2962

use Business Link and Trade Model Path instead of Business Path. · e6a38ab3

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37057 20353a03-c40f-0410-a6d1-a30d3c3de9de

e6a38ab3

trade_phase for Trade Model Path can be multiple. · 4b4f0726

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37056 20353a03-c40f-0410-a6d1-a30d3c3de9de

4b4f0726

do not import legacy code. · aeed8fb3

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37051 20353a03-c40f-0410-a6d1-a30d3c3de9de

aeed8fb3

'**' is missing in the argument of _edit(). · 1cb595ad

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37050 20353a03-c40f-0410-a6d1-a30d3c3de9de

1cb595ad

fix a wrong coding. · 6538732c

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37049 20353a03-c40f-0410-a6d1-a30d3c3de9de

6538732c

update description and group_list. · 03f14e1f

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37042 20353a03-c40f-0410-a6d1-a30d3c3de9de

03f14e1f

fix 'undefined name' errors. · ec45d968

Kazuhiko Shiozaki authored Jul 12, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37041 20353a03-c40f-0410-a6d1-a30d3c3de9de

ec45d968

Add a dummy Trade Model Path portal type only to make BT installation working.... · c013f816

Kazuhiko Shiozaki authored Jul 12, 2010

Add a dummy Trade Model Path portal type only to make BT installation working. The real one will be committed.


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37039 20353a03-c40f-0410-a6d1-a30d3c3de9de

c013f816

use getRootDeliveryValue() instead of getExplanationValue() because what we... · 795ea46b

Kazuhiko Shiozaki authored Jul 12, 2010

use getRootDeliveryValue() instead of getExplanationValue() because what we want to have here is the root delivery value.

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37037 20353a03-c40f-0410-a6d1-a30d3c3de9de

795ea46b

use getRootDeliveryValue() instead of deprecated getDeliveryValue(). · 9ac77c4b
Kazuhiko Shiozaki authored Jul 12, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@37035 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
9ac77c4b

06 Jul, 2010 12 commits

· 0dcb946a

Jean-Paul Smets authored Jul 06, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36916 20353a03-c40f-0410-a6d1-a30d3c3de9de

0dcb946a

typo · e1afc7bb

Jean-Paul Smets authored Jul 06, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36915 20353a03-c40f-0410-a6d1-a30d3c3de9de

e1afc7bb

· 79b2e1fd

Jean-Paul Smets authored Jul 06, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36914 20353a03-c40f-0410-a6d1-a30d3c3de9de

79b2e1fd

· 723f2be5

Jean-Paul Smets authored Jul 06, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36912 20353a03-c40f-0410-a6d1-a30d3c3de9de

723f2be5

Minor change · ba89c6f9

Jean-Paul Smets authored Jul 06, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36911 20353a03-c40f-0410-a6d1-a30d3c3de9de

ba89c6f9

update test to use new amount generator · a6fe1247

Aurel authored Jul 06, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36908 20353a03-c40f-0410-a6d1-a30d3c3de9de

a6fe1247

use acquisition when retrieving category on amount generator cell · 5b8b0e9e

Aurel authored Jul 06, 2010

copy more properties from model line to amount generator
manage the case where amount is defined to None on model line/cell

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36907 20353a03-c40f-0410-a6d1-a30d3c3de9de

5b8b0e9e

add comment about the use of new amount generator · 06a0772d

Aurel authored Jul 06, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36904 20353a03-c40f-0410-a6d1-a30d3c3de9de

06a0772d

prevent failure when property is None · 3d91efda

Aurel authored Jul 06, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36903 20353a03-c40f-0410-a6d1-a30d3c3de9de

3d91efda

return quantity even if 0 · 389d29d5

Aurel authored Jul 06, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36902 20353a03-c40f-0410-a6d1-a30d3c3de9de

389d29d5

make Pay Sheet Model Cell portal type use the new class document · 53d9c18d

Aurel authored Jul 06, 2010

paysheet builder does not neet to test dates


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36901 20353a03-c40f-0410-a6d1-a30d3c3de9de

53d9c18d

add a PaySheetModelCell class to define a custom · 440fb0b2

Aurel authored Jul 06, 2010

getMappedValueBaseCategoryList method


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36899 20353a03-c40f-0410-a6d1-a30d3c3de9de

440fb0b2

04 Jul, 2010 2 commits

renames business_link to trade_model_path to match with intention · e95df10a

Jean-Paul Smets authored Jul 04, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36834 20353a03-c40f-0410-a6d1-a30d3c3de9de

e95df10a

Changes in this commit are the consequence of discussion between JPS and YO on... · 14da89cc

Jean-Paul Smets authored Jul 04, 2010

Changes in this commit are the consequence of discussion between JPS and YO on the split of business path into business link and trade model path.
The notion of "completion date" does not make much sense anymore in a context in which Business Link are unrelated to dates. Instead, we provide helpers to gather lists and stats of simulation movements of an expanded simulation tree. This should be equivalet for usability at user level, with appropriate reports. The notion of "expected start date and stop date" is kept because it is useful. It is only related to Trade Model Path. A mockup (non working) implementation is provided and supports a bit of recursion so that it can handle the case of transformations. Various security declarations were added.
Next commit will make this work if everyone agrees on interfaces.

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36833 20353a03-c40f-0410-a6d1-a30d3c3de9de

14da89cc

01 Jul, 2010 1 commit

dict.setdefault is a nice way to do this · eac4b445

Nicolas Dumazet authored Jul 01, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36760 20353a03-c40f-0410-a6d1-a30d3c3de9de

eac4b445

25 Jun, 2010 1 commit

Renamed from BusinessLink.py · 504723a3

Jean-Paul Smets authored Jun 25, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36615 20353a03-c40f-0410-a6d1-a30d3c3de9de

504723a3

24 Jun, 2010 1 commit

2010-06-22 JPS · a589c1ef

Jean-Paul Smets authored Jun 24, 2010

* Business Path now split into Business Link and Trade Model Path

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36579 20353a03-c40f-0410-a6d1-a30d3c3de9de

a589c1ef

21 Jun, 2010 1 commit

Provide BusinessPath class name to ease migration. · eee089a8

Jean-Paul Smets authored Jun 21, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@36481 20353a03-c40f-0410-a6d1-a30d3c3de9de

eee089a8