Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
erp5
Commits
04f86d23
Commit
04f86d23
authored
Dec 09, 2015
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
116e56e7
32b60e06
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
740 additions
and
7 deletions
+740
-7
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
...nTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
+2
-0
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bic_code.xml
...m/portal_skins/erp5_base/BankAccount_view/my_bic_code.xml
+84
-0
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_iban.xml
...eItem/portal_skins/erp5_base/BankAccount_view/my_iban.xml
+84
-0
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
...m/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
+2
-0
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bic_code.xml
...ns/erp5_base/BankAccount_viewFieldLibrary/my_bic_code.xml
+126
-0
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_iban.xml
..._skins/erp5_base/BankAccount_viewFieldLibrary/my_iban.xml
+121
-0
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml
...plateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml
+2
-0
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_start_date.xml
...al_skins/erp5_payroll/PaySheetLine_view/my_start_date.xml
+101
-0
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_stop_date.xml
...tal_skins/erp5_payroll/PaySheetLine_view/my_stop_date.xml
+101
-0
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml
...skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml
+1
-1
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
...n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
+7
-0
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateMovementTotalPriceFromCategory.xml
...ansaction_getYearToDateMovementTotalPriceFromCategory.xml
+102
-0
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml
...m/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml
+5
-5
bt5/erp5_payroll_l10n_fr/bt/version
bt5/erp5_payroll_l10n_fr/bt/version
+1
-1
erp5/util/testnode/testnode.py
erp5/util/testnode/testnode.py
+1
-0
No files found.
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view.xml
View file @
04f86d23
...
@@ -111,6 +111,8 @@
...
@@ -111,6 +111,8 @@
<value>
<value>
<list>
<list>
<string>
my_bank_account_type
</string>
<string>
my_bank_account_type
</string>
<string>
my_iban
</string>
<string>
my_bic_code
</string>
<string>
my_bank_country_code
</string>
<string>
my_bank_country_code
</string>
<string>
my_bank_code
</string>
<string>
my_bank_code
</string>
<string>
my_branch
</string>
<string>
my_branch
</string>
...
...
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_bic_code.xml
0 → 100644
View file @
04f86d23
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_bic_code
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_bic_code
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
BankAccount_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_view/my_iban.xml
0 → 100644
View file @
04f86d23
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_iban
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_iban
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
BankAccount_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary.xml
View file @
04f86d23
...
@@ -97,6 +97,8 @@
...
@@ -97,6 +97,8 @@
<string>
my_overdraft_facility
</string>
<string>
my_overdraft_facility
</string>
<string>
my_comment
</string>
<string>
my_comment
</string>
<string>
my_bank_account_type
</string>
<string>
my_bank_account_type
</string>
<string>
my_iban
</string>
<string>
my_bic_code
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_bic_code.xml
0 → 100644
View file @
04f86d23
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
description
</string>
<string>
display_maxwidth
</string>
<string>
external_validator
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_bic_code
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string>
Business Identifier Code
</string>
</value>
</item>
<item>
<key>
<string>
display_maxwidth
</string>
</key>
<value>
<int>
11
</int>
</value>
</item>
<item>
<key>
<string>
external_validator
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_string_field
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
BIC Code
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"Method"
module=
"Products.Formulator.MethodField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
method_name
</string>
</key>
<value>
<string>
BankAccount_validateBIC
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/BankAccount_viewFieldLibrary/my_iban.xml
0 → 100644
View file @
04f86d23
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
description
</string>
<string>
external_validator
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_iban
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string>
International Bank Account Number
</string>
</value>
</item>
<item>
<key>
<string>
external_validator
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_string_field
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
IBAN
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"Method"
module=
"Products.Formulator.MethodField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
method_name
</string>
</key>
<value>
<string>
BankAccount_validateIBAN
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml
View file @
04f86d23
...
@@ -91,6 +91,8 @@
...
@@ -91,6 +91,8 @@
<string>
my_source_section_title
</string>
<string>
my_source_section_title
</string>
<string>
my_destination_section_title
</string>
<string>
my_destination_section_title
</string>
<string>
my_destination_title
</string>
<string>
my_destination_title
</string>
<string>
my_start_date
</string>
<string>
my_stop_date
</string>
<string>
my_int_index
</string>
<string>
my_int_index
</string>
<string>
my_price
</string>
<string>
my_price
</string>
<string>
my_quantity
</string>
<string>
my_quantity
</string>
...
...
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_start_date.xml
0 → 100644
View file @
04f86d23
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
description
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_start_date
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string>
The date when the period of this contribution or bonus started.
</string>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_date
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewPayrollFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Period Start
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_stop_date.xml
0 → 100644
View file @
04f86d23
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
description
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_stop_date
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string>
The date when the period of this contribution or bonus ended.
</string>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_date
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewPayrollFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Period End
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.xml
View file @
04f86d23
...
@@ -155,7 +155,7 @@ def getSocialOrganisationValue():\n
...
@@ -155,7 +155,7 @@ def getSocialOrganisationValue():\n
# delivery) is took\n
# delivery) is took\n
business_process = business_process_list[0]\n
business_process = business_process_list[0]\n
business_path_list = business_process.getTradeModelPathValueList(trade_phase=\\\n
business_path_list = business_process.getTradeModelPathValueList(trade_phase=\\\n
\'payroll/invoicing/social_security\')\n
\'payroll/invoicing/social_security\'
, context=context
)\n
if len(business_path_list) >
1:\n
if len(business_path_list) >
1:\n
raise NotImplementedError, \'For now, it can not support more \'\\\n
raise NotImplementedError, \'For now, it can not support more \'\\\n
\'than one business_path with same trade_phase. \'\\\n
\'than one business_path with same trade_phase. \'\\\n
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
View file @
04f86d23
...
@@ -130,6 +130,7 @@ total_employee_tax = getMovementTotalPriceFromCategory(\\\n
...
@@ -130,6 +130,7 @@ total_employee_tax = getMovementTotalPriceFromCategory(\\\n
include_empty_contribution=False,\n
include_empty_contribution=False,\n
excluded_reference_list=[\'ticket_restaurant\',],\n
excluded_reference_list=[\'ticket_restaurant\',],\n
contribution_share=\'contribution_share/employee\')\n
contribution_share=\'contribution_share/employee\')\n
\n
def getTotalEmployeeTaxId(total_employee_tax):\n
def getTotalEmployeeTaxId(total_employee_tax):\n
s = \'\'\n
s = \'\'\n
if total_employee_tax:\n
if total_employee_tax:\n
...
@@ -149,6 +150,11 @@ def getTotalEmployerTaxId(total_employer_tax):\n
...
@@ -149,6 +150,11 @@ def getTotalEmployerTaxId(total_employer_tax):\n
quantity_renderer(total_employer_tax*-1))\n
quantity_renderer(total_employer_tax*-1))\n
return s\n
return s\n
\n
\n
year_to_date_total_employer_tax = paysheet.PaySheetTransaction_getYearToDateMovementTotalPriceFromCategory(\\\n
no_base_contribution=True,\n
include_empty_contribution=False,\n
excluded_reference_list=[\'ticket_restaurant\',],\n
contribution_share=\'contribution_share/employer\')\n
\n
\n
preferred_date_order = portal.portal_preferences\\\n
preferred_date_order = portal.portal_preferences\\\n
.getPreferredDateOrder() or \'ymd\'\n
.getPreferredDateOrder() or \'ymd\'\n
...
@@ -254,6 +260,7 @@ data_dict = {\n
...
@@ -254,6 +260,7 @@ data_dict = {\n
\'salaire_net_imposable\': getTaxableNetPayId(salaire_net_imposable),\n
\'salaire_net_imposable\': getTaxableNetPayId(salaire_net_imposable),\n
\'total_employee_tax\': getTotalEmployeeTaxId(total_employee_tax),\n
\'total_employee_tax\': getTotalEmployeeTaxId(total_employee_tax),\n
\'total_employer_tax\': getTotalEmployerTaxId(total_employer_tax),\n
\'total_employer_tax\': getTotalEmployerTaxId(total_employer_tax),\n
\'year_to_date_total_employer_tax\': year_to_date_total_employer_tax,\n
}\n
}\n
\n
\n
return unicodeDict(data_dict)\n
return unicodeDict(data_dict)\n
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateMovementTotalPriceFromCategory.xml
0 → 100644
View file @
04f86d23
<?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>
\'\'\'\n
This script will call the PaySheetTransaction_getMovementTotalPriceFromCategory\n
script to get the year to date summed amount of paysheet lines wich category of\n
category_list parameter is in variation_category_list of the PaySheet line and \n
wich has a base_contribution in the base_contribution_list\n
\'\'\'\n
\n
portal = context.getPortalObject()\n
accounting_module = portal.accounting_module\n
\n
from_date=DateTime(context.getStartDate().year(), 1, 1)\n
to_date=context.getStartDate()\n
\n
search_params = {\n
\'portal_type\' : \'Pay Sheet Transaction\',\n
\'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
\'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
\'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\']\n
}\n
\n
paysheet_list = [r.getObject() for r in accounting_module.searchFolder(**search_params)]\n
paysheet_list.append(context)\n
\n
yearly_amount = 0.\n
\n
script_params = {\'base_contribution\': base_contribution,\n
\'contribution_share\': contribution_share,\n
\'no_base_contribution\': no_base_contribution,\n
\'include_empty_contribution\': include_empty_contribution,\n
\'excluded_reference_list\': excluded_reference_list}\n
\n
for paysheet in paysheet_list :\n
monthly_amount = paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(**script_params)\n
yearly_amount += monthly_amount\n
\n
return yearly_amount * -1\n
</string>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
base_contribution=None, contribution_share=None, no_base_contribution=False, include_empty_contribution=True, excluded_reference_list=None
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
PaySheetTransaction_getYearToDateMovementTotalPriceFromCategory
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/payroll_odt_macro.xml
View file @
04f86d23
...
@@ -196,7 +196,7 @@
...
@@ -196,7 +196,7 @@
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
><span
tal:replace=
\'orig_message\'/
></text:p>
\n
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
><span
tal:replace=
\'orig_message\'/
></text:p>
\n
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
tal:condition=
\'python:translated_message
!=
orig_message\'
><span
tal:replace=
\'translated_message\'/
></text:p>
\n
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
tal:condition=
\'python:translated_message
!=
orig_message\'
><span
tal:replace=
\'translated_message\'/
></text:p>
\n
</table:table-cell>
\n
</table:table-cell>
\n
<table:table-cell
table:style-name=
\'Tableau1.A6\'
office:value-type=
\'string\'
tal:define=
\'orig_string
string:
Rémunération
Heures
supp.
;
orig_message
python:unicode(here.Base_translateString(orig_string,
lang=
default_language),"utf-8");
translated_message
python:unicode(here.Base_translateString(orig_string),"utf-8")\'
>
\n
<table:table-cell
table:style-name=
\'Tableau1.A6\'
office:value-type=
\'string\'
tal:define=
\'orig_string
string:
Cotisations
patronales
;
orig_message
python:unicode(here.Base_translateString(orig_string,
lang=
default_language),"utf-8");
translated_message
python:unicode(here.Base_translateString(orig_string),"utf-8")\'
>
\n
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
><span
tal:replace=
\'orig_message\'/
></text:p>
\n
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
><span
tal:replace=
\'orig_message\'/
></text:p>
\n
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
tal:condition=
\'python:translated_message
!=
orig_message\'
><span
tal:replace=
\'translated_message\'/
></text:p>
\n
<text:p
text:style-name=
\'Item_20_Table_20_Title\'
tal:condition=
\'python:translated_message
!=
orig_message\'
><span
tal:replace=
\'translated_message\'/
></text:p>
\n
</table:table-cell>
\n
</table:table-cell>
\n
...
@@ -268,15 +268,15 @@
...
@@ -268,15 +268,15 @@
\n
\n
<table:table-cell
table:style-name=
\'Tableau1.A8\'\n
<table:table-cell
table:style-name=
\'Tableau1.A8\'\n
office:value-type=
\'float\'\n
office:value-type=
\'float\'\n
tal:condition=
"python: data_dict[\'year_to_date_
bonus_worked_hour_amount
\']"
\n
tal:condition=
"python: data_dict[\'year_to_date_
total_employer_tax
\']"
\n
tal:attributes=
\'office:value
data_dict/year_to_date_
bonus_worked_hour_amount
\'
>
\n
tal:attributes=
\'office:value
data_dict/year_to_date_
total_employer_tax
\'
>
\n
<text:p
text:style-name=
\'Table_20_Contents\'\n
<text:p
text:style-name=
\'Table_20_Contents\'\n
tal:content=
"python: quantity_renderer(data_dict[\'year_to_date_
bonus_worked_hour_amount
\'])"
\n
tal:content=
"python: quantity_renderer(data_dict[\'year_to_date_
total_employer_tax
\'])"
\n
tal:attributes=
\'text:style-name
right_style_name\'
>
300000
</text:p>
\n
tal:attributes=
\'text:style-name
right_style_name\'
>
300000
</text:p>
\n
</table:table-cell>
\n
</table:table-cell>
\n
<table:table-cell
table:style-name=
\'Tableau1.A8\'\n
<table:table-cell
table:style-name=
\'Tableau1.A8\'\n
office:value-type=
\'string\'\n
office:value-type=
\'string\'\n
tal:condition=
"python: not data_dict[\'year_to_date_
bonus_worked_hour_amount
\']"
>
\n
tal:condition=
"python: not data_dict[\'year_to_date_
total_employer_tax
\']"
>
\n
<text:p
text:style-name=
\'Table_20_Contents\'/
>
\n
<text:p
text:style-name=
\'Table_20_Contents\'/
>
\n
</table:table-cell>
\n
</table:table-cell>
\n
\n
\n
...
...
bt5/erp5_payroll_l10n_fr/bt/version
View file @
04f86d23
5.4.7
5.4.8
\ No newline at end of file
\ No newline at end of file
erp5/util/testnode/testnode.py
View file @
04f86d23
...
@@ -169,6 +169,7 @@ develop = false
...
@@ -169,6 +169,7 @@ develop = false
[%(buildout_section_id)s]
[%(buildout_section_id)s]
repository = %(repository_path)s
repository = %(repository_path)s
branch = %(branch)s
branch = %(branch)s
revision =
develop = false
develop = false
"""
%
{
'buildout_section_id'
:
buildout_section_id
,
"""
%
{
'buildout_section_id'
:
buildout_section_id
,
'repository_path'
:
repository_path
,
'repository_path'
:
repository_path
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment