diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml index fa257d1695c64f98455959cd956761577490ab3c..5e3a03115e1981ba81c2ff19b2125e27e401a2f8 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getCreditPrice.xml @@ -68,7 +68,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return max(-(brain.total_price or 0), 0)\n + <value> <string>return getattr(brain, \'credit_price\', max(-(brain.total_price or 0), 0))\n </string> </value> </item> <item> @@ -120,6 +120,7 @@ <string>brain</string> <string>selection</string> <string>kwd</string> + <string>getattr</string> <string>max</string> <string>_getattr_</string> </tuple> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml index 3aabf173644fa8b74d90cd6fa5b677f1bfab9e9e..51faefc1055dd1cf997c7b83514cabf7a197a45c 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getDebitPrice.xml @@ -68,7 +68,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return max(brain.total_price, 0)\n + <value> <string>return getattr(brain, \'debit_price\', max(brain.total_price, 0))\n </string> </value> </item> <item> @@ -120,6 +120,7 @@ <string>brain</string> <string>selection</string> <string>kwd</string> + <string>getattr</string> <string>max</string> <string>_getattr_</string> </tuple> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml index 15a964872d5b1e1e77288a4db1a1df272233b780..315b20a298fcbd7b51c9f5a3c54e5718043fa0b1 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml @@ -133,8 +133,8 @@ if from_date:\n uid=\'new_000\',\n date=from_date,\n simulation_state_title="",\n - Movement_getCreditPrice=previous_total_credit,\n - Movement_getDebitPrice=previous_total_debit,\n + credit_price=previous_total_credit,\n + debit_price=previous_total_debit,\n total_price=net_balance,\n running_total_price=net_balance,\n is_previous_balance=True,\n diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index 55596b29f71b5dc7661cb817cf27a56f12e13d6a..1e3852840b57172af41e4323ea5262e777f99916 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -210 \ No newline at end of file +211 \ No newline at end of file