0f01df42ea
[MERGE] Forward-port saas-5 up to f15cbd6
2014-06-12 18:59:15 +02:00
f15cbd6520
[MERGE] Forward-port saas-4 bugfixes up to ad4c6ca
2014-06-12 18:54:36 +02:00
74168c4e9d
Merge pull request #272 from odoo-dev/master-inline-searchview-ged
...
[MERGP] Inline Searchview
This task split the searchview in two parts: SearchView and SearchViewDrawer. The drawer is displayed inside the main view and the searchview stays in place. It also changes the scrolling behavior of the web client: the main view area can scroll without affecting the UI (so the various menus stays in place)
Because of this, other large changes have been made:
the drawer has been redesigned,
the Custom Filter widget has been split in two (Custom Report and SaveCurrentFilter),
the main view is now scrollable, so the UI stays in place and only the view can change
The text 'Group By...' has been changed into 'Group By' (most addons had to be modified)
bootstrap classes are used when it makes sense (for example, badge)
the left menu is also scrollable (separately from the main view)
It is likely that some stupid bugs have been introduced. Please don't hurt me.
2014-06-12 16:27:11 +02:00
ad4c6caecf
[MERGE] Forward-port of saas-3 bugfixes up to 9f0ecb3
2014-06-12 13:52:35 +02:00
9f0ecb3572
[MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df
2014-06-12 13:49:32 +02:00
5a95d00f33
[FIX] Import - Use the right comparator to allow import with accounts_ids
2014-06-12 13:29:40 +02:00
faa09da325
Removed version="7.0" from form views
2014-06-12 09:09:59 +02:00
5d77de54e5
Merge pull request #417 from gurneyalex/7.0-fix_1311004_account_move_line_index-afe
...
[IMP] account.move.line: extra index on (date, id) corresponding to the default _order, courtesy of @gurneyalex.
Fixes https://bugs.launchpad.net/openobject-addons/+bug/1311004
2014-06-11 16:41:29 +02:00
fe209f9e7a
[MERGE] merge from master
2014-06-11 15:53:45 +02:00
b38a129d71
[FIX] account: move translatable tag
...
The field note on account.fiscal.position and account.fiscal.position.template should not be translatable in classic modules.
The l10n_multilang module is intendend to make chart of accounts multilang and is the place to set translate=True
2014-06-11 14:53:59 +02:00
a15681c348
Merge pull request #453 from odoo-dev/master-and-company-mat
...
[FIX] account_analytic_default: make company_id field actually work (fixes #270 )
2014-06-11 11:10:36 +02:00
af58bc5914
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-11 10:10:58 +02:00
59e98f1e2b
[IMP] account: removed demo data about unexisting field, causing a warning.
2014-06-11 08:44:41 +02:00
46bf4db884
[FIX] small fixes
...
- set the company_id parameters at the end of the method to avoid incompatibities with calls in account_analytic_plans
- instead of checking the context, actually pass the company_id argument in the product_change from uos_id_change
2014-06-10 14:31:36 +02:00
8202561511
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-06-10 11:43:17 +02:00
0ceee2a120
[IMP] add an index on account_move_line(date, id)
...
fixes https://launchpad.net/bugs/1311004
2014-06-06 14:47:33 +02:00
ee92839465
[FIX] account: fixed inconsistence in yaml test since some demo data was added
2014-05-30 22:25:52 +02:00
07460d7191
[IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed))
2014-05-30 19:04:13 +02:00
e3491ccb71
[IMP] account: bank statement reconciliation widget (part 2)
2014-05-30 18:47:50 +02:00
7580b6510b
[IMP] account: bank statement reconciliation widget
2014-05-30 18:34:13 +02:00
514203743d
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
...
Conflicts:
addons/mrp/mrp_view.xml
2014-05-30 10:29:30 +02:00
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +02:00
5cc8f9ca42
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
2014-05-28 10:37:16 +02:00
04211015fc
[MERGE] Forward-port of latest saas-4 fixes, up to 0452851
2014-05-27 20:49:49 +02:00
abab5c2e94
[MERGE] from trunk
2014-05-27 18:28:40 +02:00
fd21abd847
[MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da
2014-05-27 17:18:43 +02:00
30f43daa3b
[MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826
2014-05-27 16:50:02 +02:00
222e7915a6
[FIX] account: safer access to parent in invoice line form
...
In the account.invoice.line form, do not assume the parent is defined when
evaluating the context to invoice_line_tax_id as we could come from another
view (e.g.: purchase order line form).
Fixes #206
2014-05-27 10:16:44 +02:00
43977deb71
[IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison.
2014-05-27 09:42:52 +02:00
62900fe01b
Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged
...
Conflicts:
addons/crm/crm_case_section_view.xml
2014-05-26 10:06:31 +02:00
6e8e22f1be
Removed confusing doubled check box "child_depend"
...
This checkbox caused greate confusion, as it was doubled in the tax form view. Field is already present in line 937
Thanks for merging.
2014-05-23 14:01:16 -05:00
2af03e1b6e
[MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb
2014-05-22 16:44:33 +02:00
02035b27b8
[RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs
2014-05-22 14:07:15 +02:00
555677f14d
[IMP] replace all 'Group By...' by 'Group By'
...
in all searchview, the 'Group By...' looks weird, next to the Custom
Reports and Filters. This change was requested by the upper management
2014-05-22 11:44:35 +02:00
abe5c803a0
[IMP] account: support for partial reconciliation in aged partner balance
...
When computing the aged partner balance, the partial reconciliation was not
handled correctly. The reconciled amount should be removed from the original
remaining amount instead of displaying two entries in the journal.
eg: if invocie of 1000 in period 1 and payment of 300 in period 2, should only
display +700 in period 1 instead of two entries
2014-05-21 15:48:35 +02:00
35c5e56718
[FIX] address div more to the left on external reports
2014-05-21 11:57:45 +02:00
a756b82372
[MERGE] forward port of branch saas-4 up to revid bb26dea
2014-05-20 20:19:55 +02:00
bb26dea60b
[MERGE] forward port of branch saas-3 up to revid 38abc8a
2014-05-20 19:00:50 +02:00
38abc8a006
[MERGE] forward port of branch 7.0 up to revid b09b6a0
2014-05-20 18:57:04 +02:00
d88ecfa970
[FIX] sale: in paypal, the encoding of the url should be done with werkzeug instead of urllib for better handeling of unicode (opw 607866)
2014-05-20 10:16:17 +02:00
cab190b136
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9460 revid:dle@openerp.com-20140519103942-do7uem4in0jfqzo2
2014-05-19 12:46:33 +02:00
08b18426f8
Docstrings and return value
...
Method comments should be docstrings.
check5() return else condition not in loop.
2014-05-17 23:46:08 -04:00
7a861fe8a8
Typo fix
...
Typo fix
2014-05-17 23:41:16 -04:00
3c033c76d4
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10050 revid:dle@openerp.com-20140516110134-oadkw3xt5bhky781
2014-05-16 14:54:00 +02:00
29565d96fe
[MERGE] [FIX] account: when computing a tax with include_base_amount enabled, include the child tax amounts into the sum for the next tax
2014-05-14 13:02:01 +02:00
f173d926c8
Launchpad automatic translations update.
2014-05-13 06:28:52 +00:00
70eb74a260
[MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
...
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
b8089a1521
[MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
...
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
2014-05-07 19:01:12 +02:00
1091b24a0c
[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br
...
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
2014-05-07 18:00:23 +02:00
1953aa442f
[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
...
bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
2014-05-07 17:33:48 +02:00
Olivier Dony
ged-odoo
Jeremy Kersten
Fabien Meghazi
Martin Trigaux
Martin Trigaux
Thibault Delavallée
Alexandre Fayolle
qdp-odoo
Christophe Simonis
Christophe Matthieu
David Arnold
Simon Lejeune
Denis Ledoux
richierichrawr
Launchpad Translations on behalf of openerp
Quentin (OpenERP)
Christophe Simonis