diff --git a/_static/accounting.css b/_static/accounting.css index 234db077b..6fa7a83aa 100644 --- a/_static/accounting.css +++ b/_static/accounting.css @@ -84,3 +84,11 @@ li > p { .chart-of-accounts .highlight-op { background-color: #030035; } + +/* 3-column (thing, debit, credit) tables */ +/* 2nd and 3rd th & td of each row right-aligned and 1/4th width */ +.d-c-table tr > :nth-child(2), +.d-c-table tr > :nth-child(3) { + width: 25%; + text-align: right; +} \ No newline at end of file diff --git a/_static/entries.js b/_static/entries.js index 6ff302813..bd0df866f 100644 --- a/_static/entries.js +++ b/_static/entries.js @@ -45,14 +45,14 @@ var FormatEntry = React.createClass({ render: function () { return React.DOM.table( - {className: 'table table-condensed'}, + {className: 'table table-condensed d-c-table'}, React.DOM.thead( null, React.DOM.tr( null, React.DOM.th(), - React.DOM.th({width: '25%', className: 'text-right'}, "Debit"), - React.DOM.th({width: '25%', className: 'text-right'}, "Credit") + React.DOM.th(null, "Debit"), + React.DOM.th(null, "Credit") ) ), React.DOM.tbody( @@ -75,8 +75,8 @@ return React.DOM.tr( {key: index}, React.DOM.td(null, entry.get('account')), - React.DOM.td({className: 'text-right'}, entry.get('debit')), - React.DOM.td({className: 'text-right'}, entry.get('credit')) + React.DOM.td(null, entry.get('debit')), + React.DOM.td(null, entry.get('credit')) ); } }); diff --git a/index.rst b/index.rst index dfb32f2db..d20bdc722 100644 --- a/index.rst +++ b/index.rst @@ -159,7 +159,52 @@ The system can then use reconciliation to automatically mark invoices as paid .. h:div:: force-right - .. todo:: show reconciliation process, use Odoo interface? + Journal entries wrt client Joe + + .. rst-class:: table-condensed d-c-table + + +-------------------------+-------------------------+-------------------------+ + | |Debit |Credit | + +=========================+=========================+=========================+ + |Accounts Receivable |121 | | + +-------------------------+-------------------------+-------------------------+ + |Sale | |121 | + +-------------------------+-------------------------+-------------------------+ + |Cash |75 | | + +-------------------------+-------------------------+-------------------------+ + |Accounts Receivable | |75 | + +-------------------------+-------------------------+-------------------------+ + |Cash |75 | | + +-------------------------+-------------------------+-------------------------+ + |Accounts Receivable | |75 | + +-------------------------+-------------------------+-------------------------+ + |Accounts Receivable |63 | | + +-------------------------+-------------------------+-------------------------+ + |Sale | |63 | + +-------------------------+-------------------------+-------------------------+ + + Reconciliation on *Account Receivable* showing operations with Joe + + .. rst-class:: table-condensed d-c-table + + +-------------------------+-------------------------+-------------------------+ + |Accounts Receivable: Joe |Debit |Credit | + +=========================+=========================+=========================+ + |Invoice 42 |121 | | + +-------------------------+-------------------------+-------------------------+ + |Payment 55 | |75 | + +-------------------------+-------------------------+-------------------------+ + |Payment 63 (partial) | |46 | + +-------------------------+-------------------------+-------------------------+ + | | + +-------------------------+-------------------------+-------------------------+ + |Invoice 47 |63 | | + +-------------------------+-------------------------+-------------------------+ + |Payment 63 | |29 | + +-------------------------+-------------------------+-------------------------+ + |Open Balance | |34 | + +-------------------------+-------------------------+-------------------------+ + Bank Reconciliation ------------------- @@ -182,9 +227,11 @@ reconciled normally. * encode a check being sent: + .. rst-class:: table-condensed d-c-table + +--------------------+-----+------+ | |Debit|Credit| - +--------------------+-----+------+ + +====================+=====+======+ |Accounts Payable |121 | | +--------------------+-----+------+ |Emitted Checks | |121 | @@ -192,9 +239,11 @@ reconciled normally. * get the bank statement and encode it: + .. rst-class:: table-condensed d-c-table + +-----------------+-----+------+ | |Debit|Credit| - +-----------------+-----+------+ + +=================+=====+======+ |Emitted Checks |121 | | +-----------------+-----+------+ |Bank | | 121 |