Commit Graph

9813 Commits

Author SHA1 Message Date
Fabien Pinckaers ef944dcd55 [IMP] Maifest for Github README.md on main apps 2014-08-12 11:33:15 +02:00
Denis Ledoux ae65be2b2a [MERGE] forward port of branch saas-5 up to 0739bc4 2014-08-11 15:58:02 +02:00
qdp-odoo 5e20e7a302 [FIX] account, point_of_sale: fixed the feature to put money in or take money out of a cash register. Fix #1416 2014-08-11 13:18:17 +02:00
Denis Ledoux 7c647ec876 [MERGE] forward port of branch saas-4 up to 0a1e4a0 2014-08-08 17:27:29 +02:00
Denis Ledoux 0a1e4a05b2 [MERGE] forward port of branch saas-3 up to 81a902a 2014-08-08 17:06:39 +02:00
Denis Ledoux 02bf0fd9c8 [MERGE] forward port of branch 7.0 up to a86dfb8 2014-08-07 18:20:13 +02:00
fka-odoo ed79bc203f [FIX] account: child_of operator in invoice analysis report
When displaying invoice analysis of a company, include the invoices of the members of this company (opw 611084)
2014-08-07 10:24:36 +02:00
Denis Ledoux 5ca6b09375 [FIX] account: payment_ids should list payments of same account than the invoice account 2014-08-06 19:00:01 +02:00
Humberto Arocha 629e3709d0 [FIX] Account: Consolidation Account should not be carried to next fiscalyear 2014-08-06 18:01:24 +02:00
Denis Ledoux 978fd47261 [MERGE] forward port of branch 7.0 up to 095be21 2014-08-06 13:06:20 +02:00
cod-odoo 2d54afef9e [FIX] account: prevent crash onchange company_id
(rebase of #1534)
2014-08-05 15:09:32 +02:00
Anael Closson f09e11f55b [FIX] sale: quote character in company name is converted to html entity
Avoid to get company names such as "L'abc" to be transformed as "L'abc" opw 607221
2014-08-05 11:15:28 +02:00
Raphael Collet c0997d332a [FIX] account: fix unexpected invalidation of field account_invoice.reconciled
Problem: the field account_invoice.reconciled was invalidated by a workflow
signal sent from the compute method of the field. The purpose of the signal was
to re-open the invoice when the account move lines were no longer reconciled,
for instance after cancelling a reconciliation.

Solution: modify the workflow such that it makes an automatic transition from
'paid' to 're-open' when the condition 'not reconciled' is met. This works
because the field 'reconciled' is stored, and each recomputation forces a
reevaluation the workflow. The signal to re-open the invoice is thus no longer
necessary.
2014-08-05 10:01:07 +02:00
Martin Trigaux dbca34511e [FIX] account: method should return browse records, not set 2014-08-05 09:30:14 +02:00
Christophe Simonis e29a7b7b4c [FIX] account: correct v8 version of map_tax() method of account.fiscal.postion 2014-08-04 19:41:43 +02:00
Olivier Dony d706adba11 [MERGE] Forward-port saas-5 up to 37ba23d 2014-08-04 01:44:30 +02:00
Christophe Simonis b4cbef4333 [FIX] account: res.partner: limit access to "total_invoiced" field to group "group_account_invoice". Use SUPERUSER_ID to access data 2014-08-01 17:29:20 +02:00
Olivier Dony 494ecc620f [MERGE] Foward-port saas-5 up to ee4df1e 2014-08-01 14:24:07 +02:00
Olivier Dony ee4df1e397 [MERGE] Forward-port saas-4 up to 8b15482 2014-08-01 13:06:49 +02:00
Olivier Dony 8b15482e00 [MERGE] Forward-port saas-3 up to e79a367 2014-08-01 12:54:30 +02:00
Denis Ledoux a9bce700dc [FIX] account: avoid to propagate context in send by email button
There is no reason to propagate the context in those buttons.

Besides, it leads to issues concerning the email template, rendering the wrong res_id because the active_id was wrongly propagated
2014-08-01 10:05:56 +02:00
Denis Ledoux 4eba90561f [MERGE] forward port of branch 7.0 up to 7c5bf67a5f 2014-07-31 18:17:48 +02:00
Denis Ledoux 7c5bf67a5f [FIX] account: unit arg of on_change_unit_amount can be False 2014-07-31 18:15:41 +02:00
Denis Ledoux 4705802a6f [MERGE] forward port of branch 7.0 up to cd31cbf556 2014-07-31 18:06:57 +02:00
Denis Ledoux cd31cbf556 [FIX] account: on_change_unit_amount do not reset uom to default 2014-07-31 18:05:17 +02:00
Denis Ledoux 60d038c350 [FIX] account: _get_analytic_lines needs the date_invoice
During the conversion of account_invoice.py to the new API, the date_invoice written on the invoice has been moved in the end of the action_move_create method.

But, the method _get_analytic_lines needs it sooner.
2014-07-31 14:16:52 +02:00
Christophe Simonis fd4fd35e32 [MERGE] forward port of branch saas-5 up to e4cb520 2014-07-30 20:52:14 +02:00
Christophe Simonis e4cb5202a0 [MERGE] forward port of branch saas-4 up to fa07bc8 2014-07-30 20:30:14 +02:00
Géry Debongnie 366a30db95 [FIX] correct various date issues in reporting
* remove old 'day', 'month', 'field' and replace them by the actual
date/datetime field
* remove weird cast to char when creating the view to prevent crash
when grouping on them
* remove duplicates (such as 'creation_date' and 'create_date')
* fix typing errors (field type date defined as a datetime in the
postgres view)
* fix search view definition
2014-07-30 15:11:22 +02:00
Denis Ledoux 88c022dfc8 [MERGE] forward port of branch 7.0 up to bbb8d8f25a 2014-07-29 11:42:10 +02:00
Denis Ledoux 6b1a804b29 [MERGE] forward port of branch 7.0 up to b91a75f7ef
Conflicts:
	addons/base_vat/base_vat.py
	openerp/tools/safe_eval.py
2014-07-29 10:42:50 +02:00
Martin Trigaux 6dc94f0c4e Forward port of branch saas-5 up to eda2f06 2014-07-28 16:37:56 +02:00
Humberto Arocha 3fe508f200 [FIX] account: no journal items on consolidation accounts
As for the view accounts, the consolidation accounts should not allow to create journal items.
Fixes #1090
2014-07-28 12:55:58 +02:00
Olivier Dony 48140f113a [IMP] account.invoice: add extra @id on `smart button` to make inheritance easier 2014-07-25 14:18:03 +02:00
Martin Trigaux f138aa2608 [FIX] models: display_name and name_get mismatch
- display_name uses name_get and not the other way around:
name_get should not call _compute_display_name, _compute_display_name should call name_get.
The previous behaviour was not backward-compatible with the old api.
All the models redefining name_get would have 2 different behaviors between name_get and display_name.

- Do not set an inverse function to display_name:
In most cases, writing on display_name writes on _rec_name (if any, not mandatory).
If the display_name computation is redefined, we need to redefine as well the inverse method to avoid unexpected behaviour
This required to also modify tests in base_import as readonly fields are avoided.

- Remove search method on display_name:
For the same reason as for the first point, it could be good that searching on display_name use name_search (and not the other way around).
However doing this would be very inefficiant (need to do the search, without limit, extract the ids of the name_get result just to generate
a subdomain ('id', 'in', [...]). As in most cases it would anyway mean to search on the _rec_name it's better to directly do so.

- Changing label to avoid mismatch:
In view displaying the list of fields or when a match is made on the label of a field (e.g. when importing csv file,
matching is made on both label and technical name), the fact that display_name field has '
Calling it 'Display Name' will avoid most errors.

- remove display_name definition from website_forum_doc,ir_model:
These fields are doing the same thing as the display_name of the new api, we can remove them.
We need to keep the one for res.partner as it's a stored field.
2014-07-25 13:58:59 +02:00
Yannick Vaucher 951a51df3f [IMP] account: do not offer closed analytic accounts on invoices
lp:1223922, opw 609656
2014-07-24 16:23:49 +02:00
Olivier Dony ef53a831c6 [MERGE] Forward-port saas-5 up to a5f7891 2014-07-23 16:58:00 +02:00
Christophe Matthieu f478e0557b [FIX] account: the 'Customer taxes' field on the product is readonly when my product doesn't have any variant 2014-07-23 15:37:15 +02:00
Denis Ledoux a5f7891b68 [MERGE] forward port of branch saas-4 up to 5739aebfb1 2014-07-23 13:18:30 +02:00
Denis Ledoux 5739aebfb1 [MERGE] forward port of branch saas-3 up to 474eae9a43 2014-07-23 12:14:14 +02:00
Daniel Dico 42f3575bb3 [FIX] account: Bank Statement reconcilation with different currency
When generating reconciled moves in bank statement, use the amount_currency field instead of amount for currency conversion.
Otherwise we would endup with moves with an amount of 0.
2014-07-23 11:19:41 +02:00
qdp-odoo e9c92b57b9 [FIX] account: fixed the copy of a bank statement 2014-07-23 10:15:29 +02:00
Christophe Combelles 299246e2ae [FIX] account: using wizard methods instead of invoice methods
Typo during port of account.invoice to new API.

(Rebase of 02a36b6 for #1052)
2014-07-22 22:23:54 +02:00
Martin Trigaux 1f878f152a [MERGE] forward port of branch 7.0 up to 680f955 2014-07-22 13:39:15 +02:00
Martin Trigaux c58bf1e3bc [FIX] account: better error message when regenarating opening entries (opw 606923)
If we try to generate twice entries on the same fiscal year, we can get completly unrelated errors ("You can only reconcile journal items with the same partner").
With this, we make sure people will first cancel the entries before regeneraing the entries.
2014-07-18 16:53:01 +02:00
qdp-odoo 954ab3eefb Merge pull request #1268 from odoo-dev/8.0-pos-fixes-qdp
[FIX] point_of_sale: fixed errors that avoid closing a pos session + [IM...
2014-07-22 08:58:02 +02:00
qdp-odoo 5ae60d8a2d [FIX] point_of_sale: fixed errors that avoid closing a pos session + [IMP] account: added back the account_id field on statement.line obj to ease the reconciliation process when importing statements (or creating them through pos.orders). Fix #932 2014-07-18 15:43:20 +02:00
rlu-odoo 8b67a7202d [REF] OpenERP --> Odoo in various UI texts
Rebranding has been done in:
- data/demo files
- html templates
- help notices
- comments
- logger messages
- and other various messages

(Commit taken from odoo-dev:8.0-improve-openerp-odoo-rlu at rev 7deaa08)

Closes #1260
2014-07-18 13:45:41 +02:00
qdp-odoo d35d47165e Merge pull request #1124 from odoo-dev/master-wmsstaging4-jco
fixes related to WMS, product variants and templates... from Josse
2014-07-17 18:18:16 +02:00
Josse Colpaert 0aad6b0498 [IMP] Check other comments on pull request: xmlid, no split in context + continue improve receipts instead of receptions 2014-07-16 11:58:22 +02:00
qdp-odoo 67133320b5 [FIX] account, usability: set the journal as readonly in bank statement form view when some entries have already been created. Fixed issue #1117 2014-07-14 11:44:12 +02:00
Stéphane Bidoul 5df99ce622 [FIX] account: add `sequence` on account.tax.code.template
Relying on the ordering by tax code is not sufficient,
as some tax declarations such as the Luxemburg one,
show tax case codes not ordered numerically

Original fix courtesy of Stefan Rijnhart (Therp)

Fixes: lp:1168948
Rebase of: PR #759
2014-07-14 11:33:05 +02:00
qdp-odoo f61339b82c [FIX] account, bank statement reconciliation: fixed huge bugs when using tax with several children or when debit/credit are 0 but some amounts have to be put in a tax code + improved usability by adding domains where needed 2014-07-11 17:15:34 +02:00
Raphael Collet 2398f480cd [IMP] addons: add _depends on models backed up by an sql view and used by other models 2014-07-08 15:32:38 +02:00
Raphael Collet 130f890215 Merge pull request #964 from odoo-dev/8.0-remove-getattr-rco
[REM] models: remove the magic methods signal_XXX()
2014-07-07 14:49:49 +02:00
jkei 47dd44be43 [FIX] account: typo in get_fiscal_position()
Fixes #971:

File "/Users/keje/src/odoo/addons/account/partner.py", line 107, in get_fiscal_position
    return part.property_account_position.id
NameError: global name 'part' is not defined
2014-07-07 14:48:20 +02:00
Raphael Collet 33eb3dffb2 [REM] models: remove the magic methods signal_XXX() 2014-07-07 11:50:30 +02:00
Raphael Collet cbe2dbb672 [MERGE] new v8 api by rco
A squashed merge is required as the conversion of the apiculture branch from
bzr to git was not correctly done. The git history contains irrelevant blobs
and commits. This branch brings a lot of changes and fixes, too many to list
exhaustively.

- New orm api, objects are now used instead of ids
- Environements to encapsulates cr uid context while maintaining backward compatibility
- Field compute attribute is a new object oriented way to define function fields
- Shared browse record cache
- New onchange protocol
- Optional copy flag on fields
- Documentation update
- Dead code cleanup
- Lots of fixes
2014-07-06 17:05:41 +02:00
Raphaël Valyi d78192c489 [IMP] account: add context in invoice onchange_partner_id method
(Manual rebase of PR #915)
2014-07-05 02:47:28 +02:00
Thibault Delavallée 27fa618882 [REV] Partial revert of search view changes: indeed the graph view is not already capable of handling group_by on any field, declaring them is still necessary. 2014-07-04 16:44:55 +02:00
qdp-odoo 13b52c3fb7 [IMP] account: added a button on bank statements to see the journal items created as soon as some are created 2014-07-04 14:45:50 +02:00
qdp-odoo 9a4784fcbe [IMP] account, account_cancel: added the possibility to cancel a single statement line when it has already been through the reconciliation process 2014-07-04 11:07:23 +02:00
Thibault Delavallée 83dbbbc26f Merge pull request #638 from odoo-dev/master-improve-configuration-warnings-ssh
[IMP] account, account_voucher, google_drive, hr_timesheet, users: use redirectwarning instead of some warnings to ease the configuration process. Also fixed some css and js issues in the display of the redirect warning.
2014-07-04 09:28:55 +02:00
qdp-odoo fd38163a38 Merge pull request #840 from Bubbles-IT/fix-expected-list-statement-proposition
Problem during reconcilement of bank statement with an exact match.

Thanks Niels
2014-07-03 13:33:48 +02:00
ssh-odoo 6cc4bd4312 [Imp]:Improve configuration warning msg
[imp]:remove space

[rem]:remove code

[imp]:remove changes

[imp]:remove changes

[rem]:remove unused changes
2014-07-03 16:11:15 +05:30
Fabien Pinckaers 5cc81dd64f Fixes 2014-07-02 18:18:29 +02:00
qdp-odoo f2a2a8cca4 [FIX] account: default value for with_last_closing_balance field set to True 2014-07-01 14:46:38 +02:00
Thibault Delavallée 44a5268c00 [IMP] addons: search view cleaning / improvements due to the new search view display 2014-07-01 11:28:08 +02:00
Niels Huylebroeck e15bd7eec1 Fixing a problem where the exact match returns a single item.
The function get_data_for_reconciliations expects a list at line 473 to loop over.
Without this fix you get TypeError: string indices must be integers, not str
2014-06-30 18:50:37 +02:00
Simon Lejeune af4cd36c83 [MERGE] upstream 2014-06-30 17:48:08 +02:00
Olivier Dony 7a88100961 [IMP] account.invoice.report: default `Year` filter should include draft invoices without `date`
This affects the result when Draft invoices are included,
so that they actually appear even without any `date` value,
as they are often meant for the current year.
2014-06-30 14:25:20 +02:00
Antony Lesuisse 22f4c315a3 [IMP] automatic fiscal positions for simple cases
Add group of countries res.country.group
Add get_fiscal_position method a method to compute a fiscal position based on company_id, partner_id, delivery_id
The meaning of res.partner.fiscal_position is now a forced a fiscal position.
The default implementation should handle simple cases, like VAT in UE and sales
tax in the US, but the method can be overriden to handle more complex ficals
rules.
2014-06-30 02:12:41 +02:00
Simon Lejeune 6f0e48fb41 [FIX] wrong header in report_vat 2014-06-29 16:43:55 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Martin Trigaux 19c0435743 Merge pull request #751 from jrial/master
[FIX] account: Small performance fix + cleanup of account_invoice

Remove unused imports and variables
Merge two writes into one
Make sure we use the newly invoice_date and not the one left in the cache of the browse record
2014-06-25 16:05:00 +02:00
Juan Rial df5c302a31 Remark from MAT: invoice date wasn't passed on in original code after the original optional write. 2014-06-25 15:43:10 +02:00
Christophe Simonis 1eaa69d342 [MERGE] forward port of branch saas-5 up to 9e8e365 2014-06-25 12:44:13 +02:00
Christophe Simonis 9e8e3653f2 [MERGE] forward port of branch saas-4 up to f68c835 2014-06-25 12:43:41 +02:00
Christophe Simonis f68c83545a [MERGE] forward port of branch saas-3 up to a66f3dd 2014-06-25 12:33:17 +02:00
Christophe Simonis a66f3dd992 [MERGE] forward port of branch 7.0 up to df6b37c 2014-06-25 12:27:43 +02:00
dhr-odoo df6b37c472 [FIX] account: add multicompany rule to account.subscription.line
The wizard to generate recurring entries did not respect multicompany rules as the request was done in plain sql.
Add ir.rule and use the orm (opw 607782)
2014-06-25 12:07:02 +02:00
Juan Rial 07e2994e92 Remove unused imports/variables 2014-06-24 18:22:37 +02:00
Juan Rial 4b8e15c3fa Performance improvement: defer optional write() - there's another one coming later, values can be combined. 2014-06-24 18:17:18 +02:00
Cedric Snauwaert 31f1fad0f6 [FIX]account reconciliation widget: add account_code to filter 2014-06-23 17:20:42 +02:00
qdp-odoo d2732dab91 [REM] removed some files wrongly commited preivously because of that bitchin 'git add .' command 2014-06-23 12:02:49 +02:00
qdp-odoo 301cfbb4fb [FIX] account: display 5 items in the bank statement reconciliation proposals 2014-06-23 11:47:41 +02:00
Cedric Snauwaert b8e4be018b [FIX]remove unused variable 2014-06-23 11:45:39 +02:00
qdp-odoo 2a69cb0f1d [FIX] account: display 5 proposals in the bank statement reconciliation widget 2014-06-23 11:40:25 +02:00
Cedric Snauwaert 10568ffd3b [FIX] account: structured communication have a higher priority 2014-06-23 11:39:43 +02:00
Cedric Snauwaert 29a0e7b354 [REF]refactor account widget to reduce rpc call 2014-06-23 11:34:01 +02:00
Cedric Snauwaert 7e4443547e [WIP]remove some unneeded argument in computing reconciliation line 2014-06-23 11:33:48 +02:00
qdp-odoo af5ad37486 Merge pull request #666 from odoo-dev/master-statement-fixes-alot-qdp
evil pull request with fixes on the new bank statement reconciliation widget
2014-06-20 11:22:29 +02:00
qdp-odoo 3ac8b531f5 [IMP] account: improved demo data for bank statement reconciliation 2014-06-20 10:01:44 +02:00
qdp-odoo bc05fe262c [FIX] account: fixed the proposal of reconciliation in the bank statement for negative amounts 2014-06-20 10:01:35 +02:00
qdp-odoo 59b47119c8 [FIX] account: bank statement creation do not confuse anymore with default name 2014-06-20 10:01:23 +02:00
Cedric Snauwaert f133f397b9 [FIX]account reconciliation: filter take partner name into account if no partner defined 2014-06-20 10:01:11 +02:00
Cedric Snauwaert d59a67ed88 [FIX]account reconciliation: fix pager and filter search in widget 2014-06-20 10:00:52 +02:00
qdp-odoo f1d9683147 [IMP] account, bank statement reconciliation: bugfixes related to the use case of clearing accounts where the type is 'other' but can be reconciled (amount_residual can now be used on these accounts) 2014-06-20 10:00:41 +02:00
qdp-odoo b32e3a3f8a [FIX] account: allow to cancel a bank statement if the option is set on the bank journal 2014-06-20 09:59:09 +02:00
qdp-odoo 5e7e7cef41 [IMP] account: learn the res.partner.bank of partners in reconciliation process on bank statement + adapted l10n_be 2014-06-20 09:58:42 +02:00
Cedric Snauwaert cae213974b [FIX]account: reconciliation widget, some usability features 2014-06-20 09:58:25 +02:00
qdp-odoo 1546d022ab [FIX] account: reconciliation on structured communication has to be done on ref field, not move name 2014-06-20 09:58:14 +02:00
qdp-odoo 01d642f2d4 [IMP] account, bank statement reconciliation improvements: look for structured communication first, if no partner is given then propose any unreconciled line, refactoring and bug fixes 2014-06-20 09:56:53 +02:00
qdp-odoo 9279a77ab7 [FIX] account, bank statement reconciliation: post automatically an accounting entry of the currency rate difference at reconciliation time 2014-06-20 09:56:36 +02:00
qdp-odoo c4bc4dc3f5 [FIX] account: another way to resolve multi currency reconciliation on bank statements: show the amount in statement line currency instead of converting them into the statement currency. This is needed in order to have a balance of 0 in the foreign currency. The only remaining thing is to make a foreign currency exchange writeoff automatic at the reconciliation time if we reconcile 2 lines having the same currency_id 2014-06-20 09:55:47 +02:00
Thibault Delavallée 452c1e32da [IMP] account: removed demo data about unexisting field, causing a warning. 2014-06-19 19:04:10 +02:00
Christophe Simonis eef6330c55 [MERGE] forward port of branch saas-5 up to adf07a9 2014-06-19 16:23:32 +02:00
Christophe Simonis adf07a9490 [MERGE] forward port of branch saas-4 up to 5087612 2014-06-19 16:13:35 +02:00
Christophe Simonis 5087612d1d [MERGE] forward port of branch saas-3 up to bf53aed 2014-06-19 15:44:07 +02:00
Richard Mathot dc4178a962 Merge pull request #649 from odoo-dev/master-eval-action-context-pna
[FIX] Accounting: Filter on fiscal year in CoA tree
2014-06-19 14:32:32 +02:00
Pinakin Nayi 788404cd92 [FIX]Accounting: filter on fiscal year in CoA tree 2014-06-19 13:57:29 +02:00
Paulius Sladkevičius 3b925793a3 reconcile_partial() return reconcile record id
It should be similar like it's done with reconcile(). That would help a lot when needs to make automatic partial reconciliations.
2014-06-18 18:56:49 +03:00
Denis Ledoux 58c13d28b2 [FIX] account: report agedpartnerbalance, copy paste error
The t-foreach save the iterazied item as not_partner, not as partner
2014-06-17 13:47:15 +02:00
Denis Ledoux 3c0292645f [MERGE] Forward-port of 7.0 bugfixes up to 63ea0df73f 2014-06-16 17:37:10 +02:00
Denis Ledoux 63ea0df73f [FIX] account: default domain on journal_id field for invoices
Prior to this fix, the domain was set in the onchange methods onchange_company_id. Therefore, if the onchange was not triggered, the domain wasnt apply (e.g. while editing an existing invoice).
2014-06-16 16:55:58 +02:00
Olivier Dony 0f01df42ea [MERGE] Forward-port saas-5 up to f15cbd6 2014-06-12 18:59:15 +02:00
Olivier Dony f15cbd6520 [MERGE] Forward-port saas-4 bugfixes up to ad4c6ca 2014-06-12 18:54:36 +02:00
ged-odoo 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
Olivier Dony ad4c6caecf [MERGE] Forward-port of saas-3 bugfixes up to 9f0ecb3 2014-06-12 13:52:35 +02:00
Olivier Dony 9f0ecb3572 [MERGE] Forward-port of 7.0 bugfixes up to 4d3a5df 2014-06-12 13:49:32 +02:00
Jeremy Kersten 5a95d00f33 [FIX] Import - Use the right comparator to allow import with accounts_ids 2014-06-12 13:29:40 +02:00
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
odony 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
Géry Debongnie fe209f9e7a [MERGE] merge from master 2014-06-11 15:53:45 +02:00
Martin Trigaux 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
Martin Trigaux 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
Géry Debongnie af58bc5914 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-11 10:10:58 +02:00
Thibault Delavallée 59e98f1e2b [IMP] account: removed demo data about unexisting field, causing a warning. 2014-06-11 08:44:41 +02:00
Martin Trigaux 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
Géry Debongnie 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +02:00
Alexandre Fayolle 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
qdp-odoo ee92839465 [FIX] account: fixed inconsistence in yaml test since some demo data was added 2014-05-30 22:25:52 +02:00
qdp-odoo 07460d7191 [IMP] account: bank statement reconciliation widget (part 3: missing files lost during manual merge (renamed)) 2014-05-30 19:04:13 +02:00
qdp-odoo e3491ccb71 [IMP] account: bank statement reconciliation widget (part 2) 2014-05-30 18:47:50 +02:00
qdp-odoo 7580b6510b [IMP] account: bank statement reconciliation widget 2014-05-30 18:34:13 +02:00
Géry Debongnie 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
Christophe Simonis fb650ee92e [MERGE] product: refactoring of product variants.
close PR #222
2014-05-30 10:22:36 +02:00
Géry Debongnie 5cc8f9ca42 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-05-28 10:37:16 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Christophe Matthieu abab5c2e94 [MERGE] from trunk 2014-05-27 18:28:40 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Olivier Dony 30f43daa3b [MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826 2014-05-27 16:50:02 +02:00
Martin Trigaux 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
Christophe Matthieu 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
Géry Debongnie 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
David Arnold 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
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Géry Debongnie 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
Martin Trigaux 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
Simon Lejeune 35c5e56718 [FIX] address div more to the left on external reports 2014-05-21 11:57:45 +02:00
Christophe Simonis a756b82372 [MERGE] forward port of branch saas-4 up to revid bb26dea 2014-05-20 20:19:55 +02:00
Christophe Simonis bb26dea60b [MERGE] forward port of branch saas-3 up to revid 38abc8a 2014-05-20 19:00:50 +02:00
Christophe Simonis 38abc8a006 [MERGE] forward port of branch 7.0 up to revid b09b6a0 2014-05-20 18:57:04 +02:00
Martin Trigaux 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
Denis Ledoux 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
richierichrawr 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
richierichrawr 7a861fe8a8 Typo fix
Typo fix
2014-05-17 23:41:16 -04:00
Denis Ledoux 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
Martin Trigaux 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
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
Quentin (OpenERP) 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
Christophe Simonis 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
Christophe Simonis 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
Christophe Simonis 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
Martin Trigaux 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
Gery Debongnie 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
Launchpad Translations on behalf of openerp 5f5fd653db Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072715-4m7kz3factf743c9
2014-05-06 07:27:15 +00:00
Simon Lejeune 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
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
Josse Colpaert 8b84615de1 [MERGE] Merge from trunk test
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Simon Lejeune 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
Simon Lejeune 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
Antony Lesuisse 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
Denis Ledoux 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
Fabien Meghazi b7003a382a [MERGE] upstream
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
2014-04-29 17:41:04 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Denis Ledoux 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
Richard Mathot (OpenERP) 822393dc04 [REM] Dashboard from manifest
bzr revid: rim@openerp.com-20140429082859-p2nl9ye2f6kd47iz
2014-04-29 10:28:59 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Richard Mathot (OpenERP) 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
Launchpad Translations on behalf of openerp fdfcb6bf47 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
2014-04-29 06:41:21 +00:00
Richard Mathot (OpenERP) 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
Jaydeep Barot (OpenERP) 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
Denis Ledoux 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
Quentin (OpenERP) 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
Jaydeep Barot 74e8fb0674 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425055958-asoj1wc0pmv7mzds
2014-04-25 11:29:58 +05:30
Jaydeep Barot 9a52ef48ad [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425055310-hpkcnigeptczdadl
2014-04-25 11:23:10 +05:30
Jaydeep Barot 24e6fd332a [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140425054902-ls149dxiu4kyxkj5
2014-04-25 11:19:02 +05:30
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website)
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
2014-04-24 19:21:29 +02:00
Christophe Simonis 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
Jaydeep Barot e82a0ba6c3 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140424072307-1h72tc9krcn8l2o3
2014-04-24 12:53:07 +05:30
Jaydeep Barot 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
Jaydeep Barot dc34d310ff [typo] improve typo for _check_currency_amount constraint
bzr revid: jar@tinyerp.com-20140423121117-xitriiv7mfwvsn35
2014-04-23 17:41:17 +05:30
Jaydeep Barot 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
Jaydeep Barot 7258e428b9 [MERGE] Merge with addons
bzr revid: jar@tinyerp.com-20140423114210-dr026gp4321ll88n
2014-04-23 17:12:10 +05:30
Jaydeep Barot d59d90449c [IMP] add res remove return in if condition
bzr revid: jar@tinyerp.com-20140423114053-wnjqd7408w8sva77
2014-04-23 17:10:53 +05:30
Jaydeep Barot 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
Denis Ledoux 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
Denis Ledoux 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