diff --git a/addons/account/demo/account_bank_statement.xml b/addons/account/demo/account_bank_statement.xml new file mode 100644 index 00000000000..52667828cc5 --- /dev/null +++ b/addons/account/demo/account_bank_statement.xml @@ -0,0 +1,85 @@ + + + + + + + + + + none + BNK/2014/001 + + + draft + + + + + 001 + + + + First 2000 € of SAJ/2014/001 + + + + + + + 002 + + + + SAJ/2014/002 + + + + + + + 003 + + + + Bank fees + + + + + + 004 + + + + SAJ/2014/003 and SAJ/2014/004 + + + + + + + + + Discount For Early Payment + + Discount + percentage_of_total + -7 + + + Bank Fees + + Bank Fees + fixed + + + + Profit / Loss + + Profit / Loss + fixed + + + + diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.css b/addons/account/static/src/css/account_bank_statement_reconciliation.css new file mode 100644 index 00000000000..626d1f32dab --- /dev/null +++ b/addons/account/static/src/css/account_bank_statement_reconciliation.css @@ -0,0 +1,264 @@ +.openerp .oe_bank_statement_reconciliation { + font-size: 12px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; + cursor: default; + /* icons */ } + .openerp .oe_bank_statement_reconciliation h1 { + width: 48%; + padding: 0 0 0 15px; + margin: 0 0 35px 0; + float: left; + font-size: 2.3em; } + .openerp .oe_bank_statement_reconciliation h2 { + font-size: 1.8em; } + .openerp .oe_bank_statement_reconciliation .progress { + width: 49%; + margin: 6px 15px 0 0; + float: right; + position: relative; + display: inline-block; } + .openerp .oe_bank_statement_reconciliation .progress .progress-text { + text-align: center; + position: absolute; + width: 100%; + left: 0; + top: 2px; + z-index: 10; + text-shadow: -1px -1px 0 #f5f5f5, 1px -1px 0 #f5f5f5, -1px 1px 0 #f5f5f5, 1px 1px 0 #f5f5f5; } + .openerp .oe_bank_statement_reconciliation .oe_form_sheet { + position: relative; + padding-bottom: 30px; } + .openerp .oe_bank_statement_reconciliation .protip { + margin: 0; + position: absolute; + bottom: 7px; + right: 15px; + text-align: right; + color: #bbb; } + .openerp .oe_bank_statement_reconciliation .done_message { + width: 100%; + padding: 0 20%; + margin-top: 50px; + margin-bottom: 50px; } + .openerp .oe_bank_statement_reconciliation .done_message h2 { + margin-bottom: 30px; } + .openerp .oe_bank_statement_reconciliation .done_message h2 .congrats_icon { + float: right; + font-size: 2em; + position: relative; + top: -0.25em; } + .openerp .oe_bank_statement_reconciliation .done_message .achievements { + margin-top: 30px; + text-align: center; + position: relative; } + .openerp .oe_bank_statement_reconciliation .done_message .achievements .achievement { + font-size: 4em; + margin: 0 0.3em; + position: relative; + vertical-align: middle; + text-shadow: 2px 2px 0px rgba(0, 0, 0, 0.2); } + .openerp .oe_bank_statement_reconciliation .done_message .achievements .achievement i { + font-size: 0.5em; + color: white; + position: absolute; + top: 50%; + margin-top: -0.55em; + left: 0; + width: 100%; + text-align: center; } + .openerp .oe_bank_statement_reconciliation .done_message .action_buttons { + text-align: center; } + .openerp .oe_bank_statement_reconciliation .glyphicon { + font-size: 12px !important; } + .openerp .oe_bank_statement_reconciliation .glyphicon.line_info_button { + color: #ccc !important; } + .openerp .oe_bank_statement_reconciliation .accounting_view .glyphicon-add-remove:before { + content: "\2212"; } + .openerp .oe_bank_statement_reconciliation .match .glyphicon-add-remove:before { + content: "\2b"; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line { + margin-bottom: 30px; + /* gap between accounting_view and action view */ + /* popover */ + /* arrays of move lines */ + /* Partie infos */ + /* Match view */ + /* Action create */ } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line table { + width: 100%; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .toggle_match, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .toggle_create { + -webkit-transition-property: -webkit-transform; + -moz-transition-property: -moz-transform; + -ms-transition-property: -ms-transform; + -o-transition-property: -o-transform; + transition-property: transform; + -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); + -ms-transform: rotate(0deg); + -o-transform: rotate(0deg); + transform: rotate(0deg); } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .visible_toggle, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line[data-mode="match"] .toggle_match, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line[data-mode="create"] .toggle_create { + visibility: visible !important; + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + -o-transform: rotate(90deg); + transform: rotate(90deg); } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .change_partner_container { + width: 200px; + display: none; + position: relative !important; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line[data-mode="inactive"] .initial_line > td { + background-color: #f8f8f8 !important; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_match:not(.no_partner) .initial_line { + cursor: default !important; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_match:not(.no_partner) .initial_line .line_info_button { + cursor: pointer; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_match:not(.no_partner) .toggle_match { + visibility: hidden !important; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_partner .partner_name, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_partner .line_open_balance { + display: none !important; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line > table > tbody > tr:nth-child(1) > td table { + margin-bottom: 10px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line table.details td:first-child { + padding-right: 10px; + font-weight: bold; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table { + width: 100%; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr { + cursor: pointer; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.created_line, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr.created_line { + cursor: default !important; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.created_line .line_remove_button, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr.created_line .line_remove_button { + cursor: pointer; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td { + padding: 1px 8px; + vertical-align: middle; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(7), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(7) { + width: 15px; + padding: 0; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(1) { + text-align: left; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(2), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(2) { + width: 80px; + padding-left: 3px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(3), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(3) { + width: 100px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(5), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(5) { + text-align: right; + width: 15%; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(6), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(6) { + width: 15%; + text-align: right; + padding-right: 3px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(7), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table td:nth-child(7) { + text-align: right; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.line_open_balance, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr.line_open_balance { + color: #bbb; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr .glyphicon:not(.line_info_button), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr .glyphicon:not(.line_info_button) { + visibility: hidden; + color: #555; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr:hover .glyphicon, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.active .glyphicon, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr:hover .glyphicon, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr.active .glyphicon { + visibility: visible; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr .do_partial_reconcile_button, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr .do_partial_reconcile_button { + color: #f0ad4e; + padding-right: 5px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr .undo_partial_reconcile_button, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match table tr .undo_partial_reconcile_button { + color: #555; + padding-right: 5px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view .initial_line > td { + border-top: 1px solid #bbbbbb; + padding-top: 4px; + padding-bottom: 5px; + background-color: #f0f0f0; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -ms-transition-property: background-color; + transition-property: background-color; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view .initial_line > td:nth-child(1), .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view .initial_line > td:nth-child(7) { + border-top: none; + background: white !important; + padding-top: 6px; + padding-bottom: 3px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption { + text-align: left; + font-size: 1.1em; + font-weight: bold; + height: 26px; + margin: 0 15px 4px 15px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption .button_ok { + float: right; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption .button_ok:disabled { + opacity: 0.5; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption > span, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view caption > input { + position: relative; + top: 7px; + /* meh */ + font-weight: bold; + cursor: pointer; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(6) { + border-left: 1px solid black; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.initial_line > td:nth-child(5) { + border-top: 1px solid black; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.initial_line > td:nth-child(6) { + border-top: 1px solid black; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls { + padding: 0 0 5px 18px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls .filter { + width: 240px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls .pager_control_left, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls .pager_control_right { + display: inline-block; + cursor: pointer; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls .pager_control_left { + margin-right: 10px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls .pager_control_left.disabled, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls .pager_control_right.disabled { + color: #ddd; + cursor: default; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .show_more { + display: inline-block; + margin-left: 18px; + margin-top: 5px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create { + margin: 0 15px; + border: 1px solid #d5d5d5; + border-radius: 5px; + padding: 10px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .quick_add { + margin-bottom: 10px; + clear: both; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .quick_add:empty { + display: none; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .quick_add:empty { + display: none; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table { + width: 49%; + height: 26px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table:nth-child(2n+1) { + float: left; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table:nth-child(2n) { + float: right; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table th { + font-weight: bold; + line-height: 26px; + padding-right: 8px; + min-width: 100px; + border-right: 1px solid #ddd; + white-space: nowrap; + width: 1%; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table td { + width: 99%; + padding-left: 8px; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table input, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table select { + width: 100%; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container:nth-child(2n+1) { + width: 98%; + float: none; + margin: auto; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container td { + text-align: center; } + .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .create .oe_form > table.add_line_container .add_line { + line-height: 26px; } diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.scss b/addons/account/static/src/css/account_bank_statement_reconciliation.scss new file mode 100644 index 00000000000..3b98689bcbc --- /dev/null +++ b/addons/account/static/src/css/account_bank_statement_reconciliation.scss @@ -0,0 +1,447 @@ +$actionColWidth: 15px; +$mainTableBordersPadding: 3px; +$lightBorder: 1px solid #bbb; +$accountingBorder: 1px solid #000; +$initialLineBackground: #f0f0f0; + + +.openerp .oe_bank_statement_reconciliation { + font-size: 12px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; + cursor: default; + + h1 { + width: 48%; + padding: 0 0 0 $actionColWidth; + margin: 0 0 35px 0; + float: left; + font-size: 2.3em; + } + + h2 { + font-size: 1.8em; + } + + .progress { + width: 49%; + margin: 6px $actionColWidth 0 0; + float: right; + position: relative; + display: inline-block; + + .progress-text { + text-align: center; + position: absolute; + width: 100%; + left: 0; + top: 2px; + z-index: 10; + text-shadow: + -1px -1px 0 #f5f5f5, + 1px -1px 0 #f5f5f5, + -1px 1px 0 #f5f5f5, + 1px 1px 0 #f5f5f5; + } + } + + .oe_form_sheet { + position: relative; + padding-bottom: 30px; + } + + .protip { + margin: 0; + position: absolute; + bottom: 7px; + right: 15px; + text-align: right; + color: #bbb; + } + + .done_message { + width: 100%; + padding: 0 20%; + margin-top: 50px; + margin-bottom: 50px; + + h2 { + margin-bottom: 30px; + + .congrats_icon { + float: right; + font-size: 2em; + position: relative; + top: -0.25em; + } + } + + .achievements { + margin-top: 30px; + text-align: center; + position: relative; + + .achievement { + font-size: 4em; + margin: 0 0.3em; + position: relative; + vertical-align: middle; + text-shadow: 2px 2px 0px rgba(0,0,0,0.2); + + i { + font-size: 0.5em; + color: white; + position: absolute; + top: 50%; + margin-top: -0.55em; + left: 0; + width: 100%; + text-align: center; + //text-shadow: 1px 1px 0 black; + } + } + } + + .action_buttons { + text-align: center; + } + } + + /* icons */ + .glyphicon { + font-size: 12px !important; + + &.line_info_button { + color: #ccc !important; + } + } + .accounting_view .glyphicon-add-remove:before { + content: "\2212"; + } + .match .glyphicon-add-remove:before { + content: "\2b"; + } + + // bankStatementReconciliationLine widget + .oe_bank_statement_reconciliation_line { + margin-bottom: 30px; + + table { + width: 100%; + } + + // modes : default + .toggle_match, .toggle_create { + -webkit-transition-property: -webkit-transform; + -moz-transition-property: -moz-transform; + -ms-transition-property: -ms-transform; + -o-transition-property: -o-transform; + transition-property: transform; + -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); + -ms-transform: rotate(0deg); + -o-transform: rotate(0deg); + transform: rotate(0deg); + } + + .visible_toggle { + visibility: visible !important; + -webkit-transform: rotate(90deg); + -moz-transform: rotate(90deg); + -ms-transform: rotate(90deg); + -o-transform: rotate(90deg); + transform: rotate(90deg); + } + + .change_partner_container { + width: 200px; + display: none; + position: relative !important; + } + + // modes : specific + &[data-mode="match"] { + .toggle_match { + @extend .visible_toggle; + } + } + + &[data-mode="create"] { + .toggle_create { + @extend .visible_toggle; + } + } + + &[data-mode="inactive"] { + .initial_line > td { + background-color: ($initialLineBackground + #080808) !important; + } + } + + &.no_match:not(.no_partner) { + .initial_line { + cursor: default !important; + + .line_info_button { + cursor: pointer; + } + } + .toggle_match { + visibility: hidden !important; + } + } + + &.no_partner { + .partner_name, .line_open_balance { + display: none !important; + } + } + + /* gap between accounting_view and action view */ + > table > tbody > tr:nth-child(1) > td table { + margin-bottom: 10px; + } + + /* popover */ + table.details { + td:first-child { + padding-right: 10px; + font-weight: bold; + } + } + + /* arrays of move lines */ + .accounting_view, .match table { + width: 100%; + + tr { + cursor: pointer; + + &.created_line { + cursor: default !important; + + .line_remove_button { + cursor: pointer; + } + } + } + + td { + padding: 1px 8px; + vertical-align: middle; + } + + td:nth-child(1), td:nth-child(7) { + width: $actionColWidth; + padding: 0; + } + + td:nth-child(1) { + text-align: left; + } + + td:nth-child(2) { + width: 80px; + padding-left: $mainTableBordersPadding; + } + + td:nth-child(3) { + width: 100px; + } + + td:nth-child(4) { + + } + + td:nth-child(5) { + text-align: right; + width: 15%; + } + + td:nth-child(6) { + width: 15%; + text-align: right; + padding-right: $mainTableBordersPadding; + } + + td:nth-child(7) { + text-align: right; + } + + tr.line_open_balance { + color: #bbb; + } + + tr .glyphicon:not(.line_info_button) { + visibility: hidden; + color: #555; + } + + tr:hover .glyphicon, tr.active .glyphicon { + visibility: visible; + } + + tr .do_partial_reconcile_button { + color: #f0ad4e; + padding-right: 5px; + } + + tr .undo_partial_reconcile_button { + color: #555; + padding-right: 5px; + } + } + + /* Partie infos */ + .accounting_view { + + .initial_line > td { + border-top: $lightBorder; + padding-top: 4px; + padding-bottom: 5px; + background-color: $initialLineBackground; + -webkit-transition-property: background-color; + -moz-transition-property: background-color; + -ms-transition-property: background-color; + transition-property: background-color; + + &:nth-child(1), &:nth-child(7) { + border-top: none; + background: white !important; + // Hack pour l'alignement au px près + padding-top: 6px; + padding-bottom: 3px; + } + } + + caption { + text-align: left; + font-size: 1.1em; + font-weight: bold; + height: 26px; + margin: 0 $actionColWidth 4px $actionColWidth; + + .button_ok { + float: right; + + &:disabled { + opacity: 0.5; + } + } + + > span, > input { + position: relative; top: 7px; /* meh */ + font-weight: bold; + cursor: pointer; + } + } + + // accounting "T" + td:nth-child(6) { border-left: $accountingBorder; } + tr.initial_line > td { + &:nth-child(5) { border-top: $accountingBorder; } + &:nth-child(6) { border-top: $accountingBorder; } + } + } + + + /* Match view */ + .match { + + .match_controls { + padding: 0 0 5px ($actionColWidth+$mainTableBordersPadding); + + .filter { + width: 240px; + } + + .pager_control_left, .pager_control_right { + display: inline-block; + cursor: pointer; + } + + .pager_control_left { + margin-right: 10px; + } + + .pager_control_left.disabled, .pager_control_right.disabled { + color: #ddd; + cursor: default; + } + } + + .show_more { + display: inline-block; + margin-left: ($actionColWidth+$mainTableBordersPadding); + margin-top: 5px; + } + } + + + /* Action create */ + .create { + margin: 0 $actionColWidth; + border: 1px solid #d5d5d5; + border-radius: 5px; + padding: 10px; + + .quick_add { + margin-bottom: 10px; + clear: both; + + &:empty { + display: none; + } + } + .quick_add:empty { + display: none; + } + + .oe_form > table { + width: 49%; + height: 26px; + + &:nth-child(2n+1) { float: left; } + &:nth-child(2n) { float: right; } + + th { + font-weight: bold; + line-height: 26px; + padding-right: 8px; + min-width: 100px; + border-right: 1px solid #ddd; + white-space: nowrap; + width: 1%; + } + + td { + width: 99%; + padding-left: 8px; + } + + input, select { + width: 100%; + } + + &.add_line_container { + &:nth-child(2n+1) { + width: 98%; + float: none; + margin: auto; + } + + td { + text-align: center; + } + + .add_line { + line-height: 26px; + } + } + } + } + } +} diff --git a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml new file mode 100644 index 00000000000..f311207ad8c --- /dev/null +++ b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml @@ -0,0 +1,194 @@ + + + + + +
+

+ Good Job! Bank statements are fully reconciled.

+

This page displays all the bank transactions that are to be reconciled and provides with a neat interface to do so.

+
+
+
+ + +
+

+
+
0 /
+
+
+
+
+
+

Tip : Hit ctrl-enter to validate the whole sheet.

+
+
+ + +
+

+

It took you to reconcile transactions.
That's on average seconds per transaction.

+ +

You validated reconciliations with the ctrl-enter shortcut.

+
+

+ + + +

+

+ + + + +

+
+
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+ + +
+
+ () + +
+
+
+
+ + + +
+
+
+ +
+ +
+
+ +
New
+
+
+
+
+ + + No result matching '' + + + + + + +
+
+ + + + + + + + + +
Date
Partner
Transaction
Description
Amount ()
Account
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID
Account
Journal
Period
Date
Due Date
Amount + () +
+
+ + + + + + + + + + + + + + + + + + + + Open balance + + + + + +
diff --git a/addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js b/addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js new file mode 100644 index 00000000000..720c22eddc8 --- /dev/null +++ b/addons/account_analytic_plans/static/src/js/account_bank_reconciliation.js @@ -0,0 +1,35 @@ +openerp.account_analytic_plans = function(instance) { + +var _t = instance.web._t, + _lt = instance.web._lt; +var QWeb = instance.web.qweb; + +instance.web.account.bankStatementReconciliation.include({ + + init: function(parent, context) { + this._super(parent, context); + delete this.create_form_fields.analytic_account_id; + this.create_form_fields["analytic_plan"] = { + id: "analytic_plan", + index: 4, + corresponding_property: "analytics_id", + label: _t("Analytic Distribution"), + required: false, + tabindex: 14, + group: "analytic.group_analytic_accounting", + constructor: instance.web.form.FieldMany2One, + field_properties: { + relation: "account.analytic.plan.instance", + string: _t("Analytic Distribution"), + type: "many2one", + } + }; + }, + + start: function() { + return this._super().then(function() { + }); + }, + +}); +}; diff --git a/addons/account_analytic_plans/views/account_analytic_plans.xml b/addons/account_analytic_plans/views/account_analytic_plans.xml new file mode 100644 index 00000000000..306e8616496 --- /dev/null +++ b/addons/account_analytic_plans/views/account_analytic_plans.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/addons/l10n_be_coda/l10n_be_coda_demo.xml b/addons/l10n_be_coda/l10n_be_coda_demo.xml new file mode 100644 index 00000000000..63436a60a92 --- /dev/null +++ b/addons/l10n_be_coda/l10n_be_coda_demo.xml @@ -0,0 +1,36 @@ + + + + + bank + BE33737018595246 + KREDBEBB + + + + + + + + + + + + + + + + + + + + + + + + +