faa09da325
Removed version="7.0" from form views
2014-06-12 09:09: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
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
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
fb650ee92e
[MERGE] product: refactoring of product variants.
...
close PR #222
2014-05-30 10:22:36 +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
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
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
Fabien Meghazi
Martin Trigaux
Thibault Delavallée
Martin Trigaux
qdp-odoo
Christophe Simonis
Olivier Dony
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)