diff --git a/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsDestinationFECXML.xml b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsDestinationFECXML.xml index 8d5bc2e89c828c8c9840ffba299f82f20e127f9e..8cd33004b02e1a58b68894a23a5a6b47e29a2833 100644 --- a/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsDestinationFECXML.xml +++ b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsDestinationFECXML.xml @@ -48,9 +48,10 @@ <tal:block tal:repeat="line python:context.contentValues(portal_type=context.getPortalAccountingMovementTypeList())"><ligne\n tal:define="account python:line.getDestinationValue(portal_type=\'Account\')" tal:condition="python: account is not None">\n <CompteNum tal:content="account/Account_getGapId">Reference Compte (Account_getGapId)</CompteNum>\n - <CompteLib tal:content="account/getTranslatedTitle">Translated Title Compte</CompteLib>\n - <tal:block tal:replace="nothing"><CompteAuxNum></CompteAuxNum>\n - <CompteAuxLib></CompteAuxLib>\n + <CompteLib tal:content="line/Movement_getDestinationCompteLib">Translated Title Compte</CompteLib>\n + <tal:block tal:condition="python: account.getAccountType() in (\'asset/receivable\', \'liability/payable\')"\n + tal:define="third_party line/getSourceSectionValue"><CompteAuxNum tal:content="python: third_party.getDestinationReference() or third_party.getSourceReference() or third_party.getReference() or third_party.getId()"></CompteAuxNum>\n + <CompteAuxLib tal:content="third_party/getTitle"></CompteAuxLib></tal:block><tal:block>\n <Montantdevise></Montantdevise>\n <Idevise></Idevise></tal:block>\n <Debit tal:content="python: \'%0.2f\' % (line.getDestinationAssetDebit() or line.getDestinationDebit())"></Debit>\n diff --git a/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsSourceFECXML.xml b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsSourceFECXML.xml index c52b8d24b860dedc9e05f0e4bfe8589ad0d4eb64..95206d675a5f3ccd7d00fcc05af438d32ca64539 100644 --- a/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsSourceFECXML.xml +++ b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/AccountingTransaction_viewAsSourceFECXML.xml @@ -48,9 +48,10 @@ <tal:block tal:repeat="line python:context.contentValues(portal_type=context.getPortalAccountingMovementTypeList())"><ligne\n tal:define="account python:line.getSourceValue(portal_type=\'Account\')" tal:condition="python: account is not None">\n <CompteNum tal:content="account/Account_getGapId">Reference Compte (Account_getGapId)</CompteNum>\n - <CompteLib tal:content="account/getTranslatedTitle">Translated Title Compte</CompteLib>\n - <tal:block tal:replace="nothing"><CompteAuxNum></CompteAuxNum>\n - <CompteAuxLib></CompteAuxLib>\n + <CompteLib tal:content="line/Movement_getSourceCompteLib">Translated Title Compte</CompteLib>\n + <tal:block tal:condition="python: account.getAccountType() in (\'asset/receivable\', \'liability/payable\')"\n + tal:define="third_party line/getDestinationSectionValue"><CompteAuxNum tal:content="python: third_party.getDestinationReference() or third_party.getSourceReference() or third_party.getReference() or third_party.getId()"></CompteAuxNum>\n + <CompteAuxLib tal:content="third_party/getTitle"></CompteAuxLib></tal:block><tal:block>\n <Montantdevise></Montantdevise>\n <Idevise></Idevise></tal:block>\n <Debit tal:content="python: \'%0.2f\' % (line.getSourceAssetDebit() or line.getSourceDebit())"></Debit>\n diff --git a/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/Movement_getDestinationCompteLib.xml b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/Movement_getDestinationCompteLib.xml new file mode 100644 index 0000000000000000000000000000000000000000..1e1c341b428864b1c2f2705b35e7905c4c064975 --- /dev/null +++ b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/Movement_getDestinationCompteLib.xml @@ -0,0 +1,72 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>account = context.getDestinationValue(portal_type=\'Account\')\n +\n +if account.isMemberOf(\'account_type/asset/cash/bank\'):\n + return "%s - %s" % (account.getTranslatedTitle(), context.getDestinationPaymentTitle())\n +\n +return account.getTranslatedTitle()\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Movement_getDestinationCompteLib</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/Movement_getSourceCompteLib.xml b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/Movement_getSourceCompteLib.xml new file mode 100644 index 0000000000000000000000000000000000000000..3b33e6362d780b0bf5d0eeb1e35b926ddc021641 --- /dev/null +++ b/bt5/erp5_accounting_l10n_fr/SkinTemplateItem/portal_skins/erp5_accounting_l10n_fr/Movement_getSourceCompteLib.xml @@ -0,0 +1,72 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string>account = context.getSourceValue(portal_type=\'Account\')\n +\n +if account.isMemberOf(\'account_type/asset/cash/bank\'):\n + return "%s - %s" % (account.getTranslatedTitle(), context.getSourcePaymentTitle())\n +\n +return account.getTranslatedTitle()\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Movement_getSourceCompteLib</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_accounting_l10n_fr/bt/revision b/bt5/erp5_accounting_l10n_fr/bt/revision index 368f89ceef179cc546403ac0d5ef1d0e4b340447..d99e90eb9675f72290ba32fbf844c1cb45c72718 100644 --- a/bt5/erp5_accounting_l10n_fr/bt/revision +++ b/bt5/erp5_accounting_l10n_fr/bt/revision @@ -1 +1 @@ -28 \ No newline at end of file +29 \ No newline at end of file