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
e0fb0a6434
[FIX] account: when creating partial reconcilation after unreconciliating one invoice, make sure we create this partial reconcilation only if we have at least two lines
...
bzr revid: mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
2014-05-07 15:35:52 +02:00
aeebac88d9
[FIX] code cleanup (addon account)
...
improve the logic of _journal_item_count (removes try/except/pass, use search_count) and remove useless one2many field in res_partner (journal_item_ids)
bzr revid: ged@openerp.com-20140507121310-ya6m71fvs40rf90d
2014-05-07 14:13:10 +02:00
5f5fd653db
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072715-4m7kz3factf743c9
2014-05-06 07:27:15 +00:00
139c35800f
[FIX] account report_invoice: display the unit of measure in the same cell as the quantity
...
bzr revid: sle@openerp.com-20140502131706-cepyft5y0essj0zr
2014-05-02 15:17:06 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
66f5bbcf67
[FIX] account report_invoice: more space to display the taxes, right field to display the fiscal position
...
bzr revid: sle@openerp.com-20140502130340-22dyefrmj4kqrzdb
2014-05-02 15:03:40 +02:00
7ad6d7a150
[FIX] Report: usage of ids in get_action more consistent: only pass them when they are useful, else pass an empty list
...
bzr revid: sle@openerp.com-20140502130310-106au0jsza0b3nwe
2014-05-02 15:03:10 +02:00
7e25b9ae55
[MERGE] saas-4 report_webkit missing dependency on report
...
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
2014-05-01 18:11:56 +02:00
b7c125869f
[FIX] account: remove partial fix for forcing right active_ids
...
This has been fixed in the web client 3991 revid:dle@openerp.com-20140430123818-zzdxmat4c5yg9gg7
bzr revid: dle@openerp.com-20140430125033-44vbf00spawm9mbg
2014-04-30 14:50:33 +02:00
b7003a382a
[MERGE] upstream
...
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
79d4c57877
[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7
...
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
2014-04-29 13:27:38 +02:00
822393dc04
[REM] Dashboard from manifest
...
bzr revid: rim@openerp.com-20140429082859-p2nl9ye2f6kd47iz
2014-04-29 10:28:59 +02:00
65f2db5c21
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
2c3ec2c7e4
[REM] mrp/stock: remmove ACLs related to removed dashboards
...
bzr revid: rim@openerp.com-20140429081808-hytvlkp461zm2l4o
2014-04-29 10:18:08 +02:00
fdfcb6bf47
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00:00
9f35c683e5
[MERGE][IMP] account/account_voucher: new filters and usability minor fixes
...
bzr revid: rim@openerp.com-20140428101311-quxvr6d3lfa842tl
2014-04-28 12:13:11 +02:00
9169be4687
[MERGE][IMP]
...
stock: more explicit error message for product scraping
account/mail: typos
bzr revid: rim@openerp.com-20140428100544-wpt325tw12ni1t0a
2014-04-28 12:05:44 +02:00
81aeccb3a0
[FIX] account: invoices button on partner sheet only display the customer invoices, and is visible only if the partner is a customer
...
bzr revid: dle@openerp.com-20140425095123-xvc51uiqt3g18181
2014-04-25 11:51:23 +02:00
7a6b00b651
[MERGE] merged with trunk up to revision 9381
...
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +02:00
74e8fb0674
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425055958-asoj1wc0pmv7mzds
2014-04-25 11:29:58 +05:30
9a52ef48ad
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425055310-hpkcnigeptczdadl
2014-04-25 11:23:10 +05:30
24e6fd332a
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140425054902-ls149dxiu4kyxkj5
2014-04-25 11:19:02 +05:30
1c4e2cfd22
[IMP] bundlify addons (except website)
...
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
7a7d7febf8
[MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1
...
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
2014-04-24 15:45:33 +02:00
e82a0ba6c3
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140424072307-1h72tc9krcn8l2o3
2014-04-24 12:53:07 +05:30
a55015b8eb
[IMP] remove store=true and add store={} in recouncile field
...
bzr revid: jar@tinyerp.com-20140424065306-e6q3g48cjee1ybni
2014-04-24 12:23:06 +05:30
dc34d310ff
[typo] improve typo for _check_currency_amount constraint
...
bzr revid: jar@tinyerp.com-20140423121117-xitriiv7mfwvsn35
2014-04-23 17:41:17 +05:30
19e4d1d6e2
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140422102821-hj5y7o835y80xx2e
bzr revid: jar@tinyerp.com-20140423114744-umaxpodiv3xlvh5s
2014-04-23 17:17:44 +05:30
7258e428b9
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140423114210-dr026gp4321ll88n
2014-04-23 17:12:10 +05:30
d59d90449c
[IMP] add res remove return in if condition
...
bzr revid: jar@tinyerp.com-20140423114053-wnjqd7408w8sva77
2014-04-23 17:10:53 +05:30
17213b034a
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140422101543-wkoatwvwzkb730ya
bzr revid: jar@tinyerp.com-20140423065938-iyevq3vfe8qmj1v3
2014-04-23 12:29:38 +05:30
b6255eb55d
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10005 revid:dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
...
bzr revid: dle@openerp.com-20140422162028-2icoebrb5q4tg3t3
2014-04-22 18:20:28 +02:00
b981f3f8ef
[FIX] *: in search views, use operator=child_of instead of filter_domain with a child_of domain
...
operator child_of has the advantage to do exact ID matching for many2one, and not just matching on the name
bzr revid: dle@openerp.com-20140422150710-mr9x3vyq0wcg31l5
2014-04-22 17:07:10 +02:00
23268ad677
[FIX] account: avoid tax on name search to execute request with empty journal (if context == {'journal_id': False}) (opw 606875)
...
bzr revid: mat@openerp.com-20140422135012-6faelx7cf0p8cvab
2014-04-22 15:50:12 +02:00
70dc4456d7
[FIX] account: Advance search on 'Tax' from journal items leads to traceback if we do not select any journal. (Maintenance Case: 606875)
...
bzr revid: rgo@tinyerp.com-20140422111115-17e6juruftp3oj2r
2014-04-22 16:41:15 +05:30
281f94ca83
[MERGE] Merge with addons
...
bzr revid: jar@tinyerp.com-20140422101757-d0rwuxj4wm25f1ae
2014-04-22 15:47:57 +05:30
0fa0c6aa78
[IMP] change add groups on groupby company and change icon on groupby company
...
bzr revid: jar@tinyerp.com-20140422101338-mb7m97rjr48t8gyz
2014-04-22 15:43:38 +05:30
e270940c5f
[FIX] account_voucher & account_move_line: while we have partial payment and we cancel one payment it also unlink the reconcile/partial reconcile tag from other payment entries also
...
bzr revid: ado@tinyerp.com-20140422101128-ugudle2s7ysc6n1p
2014-04-22 15:41:28 +05:30
71560225a9
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
2014-04-22 11:30:02 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
89fd1bede4
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
2014-04-22 08:24:59 +00:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
5bc04994f3
[IMP] typo error message and validateError and typo in chatter msg
...
bzr revid: jar@tinyerp.com-20140421065009-4j8z0awc9t4b82tb
2014-04-21 12:20:09 +05:30
8917f469f7
[IMP] in tax view add filter by purchase and sale and group by company and Tax Application and add group by company in journal.
...
bzr revid: jar@tinyerp.com-20140421055002-hlco68jwjszdsfp0
2014-04-21 11:20:02 +05:30
fcc4d29240
[IMP] when we unselect allow multi currency, values of Gain Exchange Rate Account and Loss Exchange Rate Account will become false.
...
bzr revid: jar@tinyerp.com-20140421053456-zc7x5mvy4rk34al8
2014-04-21 11:04:56 +05:30
f50acd0bf9
[IMP] merge two group by in search view to install account_followup and invisble accounting tab form partner view when user dont have account rights evnen, when is company true.
...
bzr revid: jar@tinyerp.com-20140421050534-0z3zefpb3vp8why7
2014-04-21 10:35:34 +05:30
f4d3481546
[IMP] improve strings and labels
...
bzr revid: rsi@tinyerp.com-20140418115913-xt4a4090u2oobzu6
2014-04-18 17:29:13 +05:30
a81ba2b1ea
[IMP] compute the total invoiced and display it on the stat button for invoices in res_partner form view (addon account)
...
bzr revid: ged@openerp.com-20140418093756-nxy2rkbyousbsjaf
2014-04-18 11:37:56 +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
Gery Debongnie
Josse Colpaert
Antony Lesuisse
Richard Mathot (OpenERP)
Jaydeep Barot (OpenERP)
Ravi Gohil (OpenERP)
Amit Dodiya
Rakesh Sindhav (OpenERP)