Commit Graph

3972 Commits

Author SHA1 Message Date
Will Stott c854404a2c [FIX] purchase(_requisition): typo negociation -> negotiation 2014-11-27 10:36:55 +01:00
Olivier Dony a6d24db305 [I18N] Update translations from Launchpad 8.0 branches 2014-11-19 17:49:12 +01:00
Josse Colpaert 506c52bcd1 [FIX] Avoid access error on XML id in browse when choosing picking type for manual purchase order. As they are ordered by sequence, just take the first you can find. 2014-11-18 17:22:32 +01:00
Josse Colpaert 2f5ca4380a Revert "[IMP] Remove unnecessary refresh statements because of new api"
This reverts commit b213438176.
2014-11-17 09:44:10 +01:00
Josse Colpaert b213438176 [IMP] Remove unnecessary refresh statements because of new api 2014-11-17 09:24:06 +01:00
Denis Ledoux c5714135c2 [MERGE] forward port of branch 7.0 up to 922a52d 2014-11-14 17:59:00 +01:00
Martin Trigaux 0a7633c11e [FIX] purchase: keep PO currency on picking
The delivery of a purchase order was not keeping the currency and cost price
from the purchase order for the reception. This was problematic for orders where
the invoice was generated from the picking (Invoicing Control: Based on incoming
shipments). The currency of the purchase order was kept while the cost was the
one in the company's currency.
It's better to keep the currency of the purchase order to make the invoice as
it's usually the one expected (and not convert everything to the currency of the
company). opw 615555
2014-11-14 17:29:40 +01:00
Denis Ledoux 7ab413724a [MERGE] forward port of branch 7.0 up to da15c9d 2014-11-14 15:59:33 +01:00
Martin Trigaux 7f4c4a5e8a [IMP] purchase: error message linked to product, not company 2014-11-14 12:24:31 +01:00
Josse Colpaert 518b2f6a3f [FIX] super of scheduler / delivery method and phantom boms / average price
[FIX] super of scheduler should have same params + use_new_cursor should be passed to procure orderpoint confirm

[IMP] Make sure the delivery works when doing phantom boms

[FIX] This should update the average price properly when having multiple moves with the same product

[FIX] Average price should take into account the quantities of all variants

[FIX] Make sure purchase picking type in other company works

[IMP] Views of quants and destination locations of moves
2014-11-13 11:50:01 +01:00
Josse Colpaert 86f785ae1b [FIX] #3153 Digits in wizard should be those of moves,... / Recreate delivery order from sale / Delivery method on delivery order
[IMP] Provide better purchase order picking type

[IMP] Possibly a better product uos handling in the sale order line

[FIX] Recreate of delivery order when sales order in shipping exception

[FIX] Delivery method should be passed to delivery order
2014-11-13 11:50:01 +01:00
Leonardo Donelli fb6892f857 [FIX] Remove duplicate "Can be purchased" filter.
Duplicate product filter "To Purchase" and "Can be Purchased". Same search
criteria and same name, so removing one doesn't affect people who were
referencing it (e.g. with search_default_* key in context).  Left the one
named "Can be Purchased" because consistent with the equivalent sale filter
"Can be Sold".

Fixes #2718, closes #2864
2014-11-03 15:46:55 +01:00
David Monjoie 4f973248dc [FIX] purchase: fixed recomputation of unit price when changing product quantity or uom 2014-11-03 09:09:52 +01:00
David Monjoie 7e454beff1 [FIX] purchase: fixed product_uom and price_unit update on product_id change on purchase.order_line form view 2014-10-30 12:31:37 +01:00
David Monjoie 27fa742a70 [FIX] purchase: translate purchaseorder and quotation reports 2014-10-29 11:23:34 +01:00
Josse Colpaert 06de55649b [FIX] Correct price correction courtesy of richard_willowit #2983 #2985 2014-10-17 17:38:38 +02:00
Josse Colpaert fa2461036b [FIX] Use currency of pricelist when creating PO from procurement 2014-10-13 21:33:13 +02:00
Olivier Dony 7439421ad2 [I18N] Update translations from Launchpad 8.0 branches 2014-10-08 17:52:25 +02:00
Denis Ledoux b675ff1f0a [FIX] purchase: do not pass uom in product_id_change when changing of product
To allow the on change to set the product default unit of measure when changing of product, and only in this case (not when changing price or quantity)
2014-10-08 17:21:29 +02:00
Christophe Simonis 388f1a1d7e [MERGE] forward port of branch saas-3 up to 3d4b82c 2014-10-01 16:46:03 +02:00
Denis Ledoux 3d4b82cd56 [MERGE] forward port of branch 7.0 up to 9cc54dc 2014-10-01 12:41:42 +02:00
dhr-odoo 3c9df6a71f [FIX] purchase: minmum purchase quantity and float precision (opw 610557) 2014-09-30 17:04:04 +02:00
Denis Ledoux 143d024904 [FIX] purchase: do not reset price_unit on qty or uom change
only when the product is actually changed
2014-09-30 10:41:19 +02:00
Denis Ledoux 428cb3fb13 [FIX] purchase: payment_term_id twice in the view
+ replace widget selection by options no_open no_create
2014-09-29 10:49:01 +02:00
Olivier Dony b74d830eb2 [I18N] Update translation templates with latest term changes 2014-09-23 19:13:50 +02:00
Olivier Dony 1c5b5e4290 [I18N] Update translations from Launchpad 8.0 branches
server: rev. 26 rev-id launchpad_translations_on_behalf_of_openerp-20140923072744-tkfs0yinu8msjh09
addons: rev. 39 rev-id launchpad_translations_on_behalf_of_openerp-20140923072715-5j7qvnuvmmb1zzy1
web: rev. 23 rev-id launchpad_translations_on_behalf_of_openerp-20140923072757-jvh9l6r2x0vfcyhb
2014-09-23 13:42:05 +02:00
Cedric Snauwaert fa561f5caf [FIX] wms: fix lookup of xmlid route_warehouse0_buy
Fixes #2610 courtesy of gurneyalex
2014-09-23 11:05:22 +02:00
Martin Trigaux c82bd1365c Forward port of 7.0 up to rev 9b87d6f 2014-09-19 15:28:02 +02:00
Martin Trigaux 9b87d6f371 [FIX] purchase: keep fallback behaviour that was removed at rev 8973217
If no valid invocie is found on the purchase order line, use the price and currency of the line (coherent with help message)
2014-09-19 14:47:33 +02:00
Denis Ledoux 5bd0249515 [MERGE] forward port of branch 7.0 up to a218a9e 2014-09-18 16:05:34 +02:00
Olivier Dony 53aa92d3c9 [I18N] Update translations from Launchpad branches 2014-09-18 11:47:16 +02:00
Josse Colpaert 5aeccbd90e [IMP] Use display_name instead of partner_ref 2014-09-17 21:42:07 +02:00
Josse Colpaert 066af964bf [IMP] Purchase on incoming shipments with services added 2014-09-17 21:41:42 +02:00
Josse Colpaert 0f9a9fbae3 [IMP] Purchase order wkf optim 2014-09-17 21:41:42 +02:00
qdp-odoo 8973217ea7 [FIX] stock/purchase: dates and currency rates
Use the currency rate of the purchase date instead of the one of at the reception time (opw 610430)
2014-09-17 18:04:41 +02:00
Martin Trigaux 10c3b8c3c8 [FIX] purchase: keep reference to purchase order line
When generating an invoice from a stock.picking, the reference to the purchase.order.line needs to be kept (e.g. this is needed by anglo-saxon for price valuation). (opw 600767)
2014-09-17 16:32:43 +02:00
Josse Colpaert ae2eb43e30 [IMP] Implement comments on pull request 2014-09-12 13:49:42 +02:00
Josse Colpaert d38fafdee8 [IMP] Put wkf_action_cancel back, so the method does not call itself recursively (issue 2079) 2014-09-12 13:49:42 +02:00
Josse Colpaert 1512534320 [FIX] When purchase, do not overwrite price 2014-09-12 13:49:42 +02:00
Josse Colpaert 246c425226 [WIP] Pricelist of purchase is not in stock only and remove product_manufacturer module in view + manufacturer 2014-09-12 13:49:42 +02:00
Josse Colpaert a0d855ffad [IMP] Inter-company pricing: put price on move when only partner and not connected to sale or purchase + invoice_state inverse function 2014-09-12 13:49:41 +02:00
Josse Colpaert 064b1a3a40 [IMP] Old hack where uom_id had to be empty in on_change
[IMP] Add purchase order origin on picking

[WIP] Picking type on move for location on routing

[IMP] Provide extra function for custom buttons on picking

[IMP] Action assign optim

[IMP] Push apply should take invoice_state into account.  Propagation of cancel of stock moves should depend on procurement rule
2014-09-12 13:49:41 +02:00
Olivier Dony 57829ce3ec [FIX] product,purchase,point_of_sale: force empty values for dropped fields
At 96f038a product-related fields were removed due
to an important product.template/product.product
refactoring. As the field values were simply
dropped, they may not be nullified when upgrading an
existing database. Forcing them to False will take
care of it.
2014-09-10 14:58:45 +02:00
Olivier Dony fac96241df [I18N] Update 8.0 translations with latest changes from Launchpad 2014-09-08 19:04:25 +02:00
Josse Colpaert 114f66c277 Merge pull request #2027 from odoo-dev/8.0-wmsstaging7-jco
8.0 wmsstaging7 jco
2014-09-03 21:36:01 +02:00
Josse Colpaert 7e1919fe0f [IMP] Change static buttons with group_ids each time 2014-09-03 19:19:18 +02:00
Josse Colpaert 41d36b038c [IMP] Not necessary from merge 2014-09-03 19:18:16 +02:00
Josse Colpaert ff308c2152 [IMP] Make sure we can do dropship where the purchase is invoiced on incoming shipments 2014-09-03 19:18:16 +02:00
Nicolas Seinlet c2b7bca486 - Fix #1253
- avoid using sale objects in stock_account module
- check the purchase side
2014-09-03 19:18:16 +02:00
Xavier Morel e6b56412a0 [ADD] views documentation 2014-08-28 15:02:33 +02:00
Fabien Pinckaers 8aca457e34 [IMP] Updated website urls on modules and info page 2014-08-26 21:40:18 +02:00
qdc f57787e07e [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-26 11:56:49 +02:00
Christophe Simonis 5a5f811d23 [REVERT] commit 5e5c73e
Branch 8.0 is a **stable** branch. This mean no database schema
changes.
2014-08-22 13:59:22 +02:00
qdc 5e5c73e7ba [IMP] Cleaning of reporting (group_by, filters), adding new favourites and default views, some renaming (py and xml files) 2014-08-22 09:49:09 +02:00
Christophe Simonis 8f13e8320e [MERGE] forward port of branch 7.0 up to d0a0b7d 2014-08-20 17:45:05 +02:00
Guewen Baconnier d0a0b7d91d [FIX] purchase: skip move if not linked to a purchase order
When this situation happens. the 'cost' is None and the web interface cannot handle this value, provoking a JS error. Thus, prefer to fallback on the standard way to get the cost: based on the current standard price of the product.
Fixes #1032
2014-08-20 15:13:36 +02:00
Denis Ledoux 4971c0768a [FIX] purchase: purchase buttons on product form only for purchase users 2014-08-19 12:28:58 +02:00
Olivier Dony 50ef63881a [I18N] Update 8.0 translation with latest source code 2014-08-14 17:01:54 +02:00
Olivier Dony 96c36e895c [I18N] Update all 7.0 translation templates with latest terms and annotations
Total new terms: 168
Total deleted terms: 95
Total identical terms: 16329
(Some modules skipped, typically all l10n_* modules)
2014-08-14 02:24:24 +02:00
Denis Ledoux 8b0b0f7a1b [FIX] purchase: add purchase_order_count in kanban for purchase users only
No need to set account.group_account_manager for the field supplier_invoice_count, as account.group_account_manager implies account.group_account_user
2014-08-13 16:14:56 +02:00
Josse Colpaert 5dea263e1b [FIX] Change two-one step wh, multi-comp wh, quantity field float, show product_uom_qty instead of product_qty in mrp production for moves 2014-08-12 13:37:27 +02:00
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
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 978fd47261 [MERGE] forward port of branch 7.0 up to 095be21 2014-08-06 13:06:20 +02:00
Denis Ledoux 625aa7e75d [MERGE] forward port of branch saas-5 up to 7d7f6fe 2014-08-05 16:04:58 +02:00
Denis Ledoux 7d7f6fefb1 [FIX] purchase: now allow 'can be purchased' to be checked even if not variant
Before, the field purchase_ok was set as readonly on the product form if the product wasn't a variant, to avoid users to set all the products variants associated to the product template to be set as purchase able in one action.

We now consider that this can be done by the end user
2014-08-05 16:01:55 +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 2154cc9344 [FIX] purchase: fix test merge_order (check on date_order was not correct) 2014-08-04 15:50: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
qdp-odoo cc7bc21a9d [FIX] purchase: set the commitment date as the max of scheduled dates when creating a picking from a PO, instead of leaving it at the current time (validation) which just doesn't make sense 2014-07-18 12:17:54 +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
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
Josse Colpaert 32dd003d60 [MERGE] Resolve conflicts 8.0 2014-07-13 09:27:20 +02:00
qdp-odoo e9abc723c0 Changed the type of fields.date_order on purhcase.order object from date to datetime 2014-07-08 16:04:09 +02:00
Josse Colpaert beb12f71f1 Merge branch 'odoo/8.0' into master-wmsstaging4-jco 2014-07-07 23:34:42 +02:00
Josse Colpaert bdfdba0de4 [IMP] Update manufacturing 2014-07-07 23:33:47 +02:00
Josse Colpaert 2518767005 [IMP] Start of extra primary view on product template that is not inherited by product_product 2014-07-07 21:45:11 +02:00
Josse Colpaert af0e9b8aa6 [MERGE] Fix copy_data for merge 2014-07-07 14:33:01 +02:00
Raphael Collet 33eb3dffb2 [REM] models: remove the magic methods signal_XXX() 2014-07-07 11:50:30 +02:00
Raphael Collet acb1420fb9 Revert "[IMP] addons: use the magic methods signal_XXX() instead of signal_workflow('XXX')"
This reverts commit beea451e54.
2014-07-07 11:23:06 +02:00
Raphael Collet beea451e54 [IMP] addons: use the magic methods signal_XXX() instead of signal_workflow('XXX') 2014-07-07 09:42:27 +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 7cc95f1671 [IMP] purchase: add context in PO onchange_partner_id and onchange_dest_address_id
(Manual rebase of PR #913)
2014-07-05 02:30:44 +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
Raphaël Valyi f20c7a3055 [FIX] purchase: order dest_address_id field is present twice in form view
Fixes issue #911
2014-07-04 15:59:29 +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
Josse Colpaert a3390b0f96 [IMP] Try to solve BoM expansion + check for context for splitting/copying moves 2014-06-27 15:33:07 +02:00
Josse Colpaert bdda11ab40 [IMP] Update views and production_delay and track_production should go to product_template 2014-06-26 17:52:37 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Martin Trigaux cea4861bd2 [IMP] purchase: do not display Incoming Shipments and Invoices button when not needed 2014-06-25 15:52:25 +02:00
Josse Colpaert ce3645c9d9 [IMP] Corrections on pull request 2014-06-18 16:33:53 +02:00
Josse Colpaert 6b63d40145 [MERGE] Merge from master and resolve conflict 2014-06-17 16:23:44 +02:00
Josse Colpaert a7866c12bb [FIX] master data should return something 2014-06-17 09:54:46 +02:00
Christophe Matthieu 96f038a6ab [IMP] product: all left menu item became product.template's action 2014-06-16 17:16:50 +02:00
Josse Colpaert eb13d3ee5f [IMP] Make sure there is a link between purchase order invoice and purchase order 2014-06-16 16:04:04 +02:00
Josse Colpaert 8e223c8aba [IMP] Invoice_state based on delivery wizard recheck + returns and invoice_state 2014-06-13 17:44:03 +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
Fabien Meghazi faa09da325 Removed version="7.0" from form views 2014-06-12 09:09:59 +02:00
Josse Colpaert f30cf0cf1b [IMP] Run schedulers and minimum stock rules done by company + purchase order should change date when adding (to) lines 2014-06-11 14:05:13 +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
Josse Colpaert 1c04f4d3d1 Merge remote-tracking branch 'odoo/master' into master-wmsstaging3-jco 2014-06-10 10:32:36 +02:00
Christophe Simonis b1c0bc0b46 [MERGE] forward port of branch saas-4 up to 65f68c1 2014-06-03 19:45:19 +02:00
Christophe Simonis 65f68c1f65 [MERGE] forward port of branch saas-3 up to 7dd6954 2014-06-03 19:14:22 +02:00
Christophe Simonis 7dd69540e8 [MERGE] forward port of branch 7.0 up to 0c4bc1c 2014-06-03 19:11:44 +02:00
Josse Colpaert 9376d16938 [IMP] Put cost method only once, make sure extra moves get moves in consequent pickings, default buy route on template 2014-06-02 09:58:09 +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
Denis Ledoux 65d7cc524d [FIX] purchase: Do not allow to delete a purchase order line which is validated
This restriction behavior copied from the sale.order model
Moreover, the purchase.order lines state were not set to cancel when the purchase order was cancelled.
This is now the case, this behavior is also coped from the sale.order model
When the purchase order is reset to draft, we also reset the order lines state to draft
2014-05-28 18:00:11 +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
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
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
JoshuaJan e6973e2c64 'invoiced' fields help message is wrong 2014-05-26 17:55:26 +08:00
Denis Ledoux c59427d23f [FIX] purchase: po email template, the currency could be different than the pricelist currency 2014-05-23 17:13:42 +02: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
Simon Lejeune 35c5e56718 [FIX] address div more to the left on external reports 2014-05-21 11:57:45 +02:00
Launchpad Translations on behalf of openerp c2584c8cb0 Launchpad automatic translations update. 2014-05-18 05:53:48 +00:00
Launchpad Translations on behalf of openerp 6ab0f645bc Launchpad automatic translations update. 2014-05-17 07:10:37 +00:00
Quentin (OpenERP) 6a697bc391 [REM] removed old conflicting files badly merged (?)
bzr revid: qdp-launchpad@openerp.com-20140508144751-jhny9a3ozevwz6ja
2014-05-08 16:47:51 +02:00
Quentin (OpenERP) 168b8e1d5e [REM] removed old conflicting files badly merged (?)
bzr revid: qdp-launchpad@openerp.com-20140508143825-owheu6q219d8qbww
2014-05-08 16:38:25 +02:00
Launchpad Translations on behalf of openerp 5f1bd401f8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140508063251-ztdomqygi2izm2o3
2014-05-08 06:32:51 +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
Quentin (OpenERP) 661c109189 [FIX] procurement.rule._get_action() needs to be translatable
bzr revid: qdp-launchpad@openerp.com-20140507171431-jtyz901xmej6elmp
2014-05-07 19:14:31 +02:00
Gery Debongnie eb1d981435 [FIX] code cleanup (addon purchase)
simplify a few _count methods by removing useless try/except/pass and by using search_count when appropriate.  It allows us to remove two one2many fields as well.

bzr revid: ged@openerp.com-20140507144532-dgm9mfgt9k5p10jr
2014-05-07 16:45:32 +02:00
Gery Debongnie c941eb8ca4 [FIX] code cleanup (addon purchase)
remove useless one2many field in product.product, and improves the way
purchase_count is computed

bzr revid: ged@openerp.com-20140506150732-e0ztuzqm7hqu183p
2014-05-06 17:07:32 +02:00
Josse Colpaert c60c1d1a72 [DEL] Delete boards
bzr revid: jco@openerp.com-20140502134701-lnoowskaqj9nsaof
2014-05-02 15:47:01 +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
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
Olivier Dony 52480275c3 [IMP] purchase: invoice creation more modular/extensible through the introduction of a _prepare_invoice method()
This is similar to what was previously done for Sales Orders.

bzr revid: odo@openerp.com-20140430140103-hfumie3ndvlodgeh
2014-04-30 16:01:03 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
2014-04-29 10:19:37 +02:00
Quentin (OpenERP) 7ed26f1e07 [REF] product refactoring: prices.history model renamed into product.price.history + passed 'date' as real parameter instead of contextual one in get_history_price() because it makes more sense.
bzr revid: qdp-launchpad@openerp.com-20140428153355-vbuam1hfnah7m4wp
2014-04-28 17:33:55 +02:00
Quentin (OpenERP) cba2365d95 [MERGE] branch of jco fixing shipping exception in mrp + cancellation in chained moves
bzr revid: qdp-launchpad@openerp.com-20140425132449-s7e8duh884rirrqz
2014-04-25 15:24:49 +02:00
Quentin (OpenERP) e077a96cdd [REF] purchase: cleaning the TODO messages
bzr revid: qdp-launchpad@openerp.com-20140425091128-13uuwk7txzjoos6z
2014-04-25 11:11:28 +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
Quentin (OpenERP) f402240ade [MERGE] stock usability improvements
bzr revid: qdp-launchpad@openerp.com-20140424143838-a3so6ouc1q3la3ch
2014-04-24 16:38:38 +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
Launchpad Translations on behalf of openerp c7565cd540 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
2014-04-24 06:32:49 +00:00
Quentin (OpenERP) 2e7579c54d [MERGE] branch of jco with fix of orderpoint computation + small refactoring of action_cancel() of purchase.order
bzr revid: qdp-launchpad@openerp.com-20140423155557-t0gp3akhzb2y85cz
2014-04-23 17:55:57 +02:00
Josse Colpaert 7a8222631e [IMP] Make sure the propagation of moves cancels procurements where necessary + manufacture and purchase cancel is not propagated by default
bzr revid: jco@openerp.com-20140423141700-60gbuxb4atp1z6ek
2014-04-23 16:17:00 +02:00
Josse Colpaert 5807343602 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140423095528-h4dpd9gdmh8lmk6j
2014-04-23 11:55:28 +02:00
Josse Colpaert 6748d2818d [IMP] Make sure procurement goes only in exception on cancel + simplify wkf
bzr revid: jco@openerp.com-20140423082808-2gjgowz6h89l5alu
2014-04-23 10:28:08 +02:00
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
Josse Colpaert 16adb0d75d [WIP] Purchase order cancel or done results in procurement state being changed immediately
bzr revid: jco@openerp.com-20140422153400-5ei2c4h4hti7up1i
2014-04-22 17:34:00 +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
Josse Colpaert f119c72f5b [IMP] Help messages for warehouse settings
bzr revid: jco@openerp.com-20140422123326-1fuwmkja041j34yn
2014-04-22 14:33:26 +02:00
Bharat Devnani (Open ERP) 3a0c820dfd [MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock)
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
2014-04-22 14:30:22 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365.
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
Bharat R. Devnani (OpenERP) b8d4387d33 [MERGE] merged with main addons branch
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
Cedric Snauwaert 19fac75f42 [FIX]bootstrap tooltip cleaned from trunk-tipsy-to-bootstrap
bzr revid: csn@openerp.com-20140417090515-l1ku2kdc0lzadjxg
2014-04-17 11:05:15 +02:00
Gery Debongnie 0c24df7074 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
Quentin (OpenERP) dd47f684f0 [FIX] sale_order_dates yml fixed + calls to fields.date.date_to_datetime function fixed + improved in order to use it in purchase as well
bzr revid: qdp-launchpad@openerp.com-20140416154830-ec6kbs3bupd4j5vt
2014-04-16 17:48:30 +02:00
Quentin (OpenERP) fbd3255e37 [MERGE] merged trunk up to revision 9350
bzr revid: qdp-launchpad@openerp.com-20140416150551-lxpscdd74mgv99r1
2014-04-16 17:05:51 +02:00
Thibault Delavallée fe8a745b02 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt
2014-04-16 10:29:25 +02:00
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Christophe Simonis 61da3f4aba [MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Gery Debongnie 569d9dc75a [FIX] move the purchase_ids, purchase_count fields defined in purchase.py from the model product.template to product.product to make them work correctly (addon purchase)
bzr revid: ged@openerp.com-20140415135411-428kxcysuy73soeu
2014-04-15 15:54:11 +02:00
Gery Debongnie d1eb2547bb [FIX] change the string 'pay invoices' to 'supplier inv.' to avoid misleading the user (there is another 'invoices' button) (addon purchases)
bzr revid: ged@openerp.com-20140415131818-geev2ewszvkjxj19
2014-04-15 15:18:18 +02:00
Denis Ledoux f8d5ef0f80 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
2014-04-15 15:09:51 +02:00
Quentin (OpenERP) 205a13e2f5 [MERGE] stock_account, purchase: better usability in settings to install stock_account and manage options to use costing methods and invenotyr valuation
bzr revid: qdp-launchpad@openerp.com-20140415112915-k8ba71ddo1vgu0tm
2014-04-15 13:29:15 +02:00
Denis Ledoux a701934ac7 [FIX] purchase: invoiced based on invoiced bool of purchase order line, instead of rate
invoiced bool of purchase order line is set to true on invoice validation, not on invoice creation

bzr revid: dle@openerp.com-20140415081211-jz6if0vzgq3inzzw
2014-04-15 10:12:11 +02:00
Randhir Mayatra rma-openerp c399e1daaf [MERGE] merge with latest trunk and resolve conflicts
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
2014-04-14 16:31:49 +05:30
Quentin (OpenERP) 398d96f273 [MERGE] merged trunk up to revision 9327
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
Thibault Delavallée 5ea15d56fb [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140414090428-y435e4tsy4ju5nc3
2014-04-14 11:04:28 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
Thibault Delavallée 94c580e933 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140411075551-xh4o3k3172cr7scz
2014-04-11 09:55:51 +02:00
Randhir Mayatra rma-openerp 85714eabb6 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140411062328-srzutp1ln9xe7sxq
2014-04-11 11:53:28 +05:30
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Thibault Delavallée 8178669795 [FIX] mail, mass_mailing
- mail: now trigger postprocess_sent_message in every case, being sent or not, as the state
is propagated in the method; udpated all addons accordingly;
- email_template: fixed URL to edit it in website + form view;
- mass_mailing: barchart now send jsonified value;
- mass_mailing: tweaking the form view with all options

bzr revid: tde@openerp.com-20140408124053-o9tb14k6v47s5mjd
2014-04-08 14:40:53 +02:00
Thibault Delavallée e3d31b5dce [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140408083418-0gn78r4ueg7tyu0v
2014-04-08 10:34:18 +02:00
Quentin (OpenERP) b14883f10c [MERGE] jco branch with few bugfixes
bzr revid: qdp-launchpad@openerp.com-20140407175001-g4rx6rft090ul2li
2014-04-07 19:50:01 +02:00
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
2014-04-07 18:33:18 +02:00
Christophe Simonis ffae380725 [MERGE] forward port of branch 7.0 up to revid 4169 mat@openerp.com-20140407120612-mjb08yts2oa4k4jz
bzr revid: chs@openerp.com-20140407144439-10n8fs6zovodwwtx
bzr revid: chs@openerp.com-20140407144625-jfimvsx4mgrkztqv
2014-04-07 16:46:25 +02:00
Kersten Jeremy 5be8fc620e [FIX] Purchase - Make type 'order' as default invoice method in 'Purchase Settings'. Purchase by default use 'order', once an user update a parameter in 'Purchase Setting' without changing the default type (which by default was set to manual and not to order) the behavior is changed
bzr revid: jke@openerp.com-20140407104402-nlswdttmkmxznap2
2014-04-07 12:44:02 +02:00
Randhir Mayatra rma-openerp 9dbaa58694 [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
2014-04-07 15:54:40 +05:30
Launchpad Translations on behalf of openerp bb8560f779 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140405061904-60l019fp9qbl890t
bzr revid: launchpad_translations_on_behalf_of_openerp-20140406065319-1cr9ypow2w870fbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140407065316-8z3pm4a79uff45z5
2014-04-07 06:53:16 +00:00
Simon Lejeune 4983f86d81 [MERGE] trunk
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
Randhir Mayatra rma-openerp 4c0f7b1be8 [IMP] improve strings and project view
bzr revid: rma@tinyerp.com-20140404112926-716zimuh3p2ec80k
2014-04-04 16:59:26 +05:30
Josse Colpaert d45fd02abd [IMP] Push rules should try to find routes on warehouse first before searching anything
bzr revid: jco@openerp.com-20140403155735-y357mj3gtp7j3x7i
2014-04-03 17:57:35 +02:00
Quentin (OpenERP) 4077c91ce6 [FIX] purchase: this function isn't needed anymore
bzr revid: qdp-launchpad@openerp.com-20140403160213-l9mijzuohmz0o7ct
2014-04-03 18:02:13 +02:00
Simon Lejeune 33471e966f [FIX] missing dependancies of report module
bzr revid: sle@openerp.com-20140403091818-6evr0k4r2k4818j1
2014-04-03 11:18:18 +02:00
Quentin (OpenERP) 615a55b02b [FIX] purchase: fixed warning 'no field schedule_range exists in res.company' because it has been removed few commits ago
bzr revid: qdp-launchpad@openerp.com-20140403082423-03alt09lyin9b40z
2014-04-03 10:24:23 +02:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
Quentin (OpenERP) 1ce3d6a45e [FIX] purchase: PO buttons in form view
bzr revid: qdp-launchpad@openerp.com-20140403080548-4d1xmtlmulk3buuv
2014-04-03 10:05:48 +02:00
Quentin (OpenERP) fe0e95d29b [IMP] procurement: removed the schedule_range field on res.company which was error prone and not really usefull + made the scheduler run in SUPERUSER to avoid intercompany and access rights issues + made the run of procurement as SUPERUSER too for the same reasons
bzr revid: qdp-launchpad@openerp.com-20140403071010-5mrox75rkufur2nw
2014-04-03 09:10:10 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
2014-04-02 06:44:59 +00:00
Quentin (OpenERP) d381fd5d33 [FIX] purchase: cancellation of procurement linked to a purchase order line should only decrease quantity for PO in draft state + typo
bzr revid: qdp-launchpad@openerp.com-20140328134308-puycr1vf32l13mpu
2014-03-28 14:43:08 +01:00
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
2014-03-28 19:00:51 +05:30
Quentin (OpenERP) 23293e2b03 [FIX] cancelling a procurement with stacked purchase now decrease the quantity on the purchase line instead of cancelling it
bzr revid: qdp-launchpad@openerp.com-20140328102934-2qhryl2hkwodrbpv
2014-03-28 11:29:34 +01:00
Quentin (OpenERP) b8b22532a6 [FIX] stock, sale_stock, purchase: fixed the dropshipping flow
bzr revid: qdp-launchpad@openerp.com-20140327121140-18yxvp8wcdlqvaa5
2014-03-27 13:11:40 +01:00
Quentin (OpenERP) bf07b75045 [FIX] purchase: _get_picking_ids was wrong as it wasn't returning an empty list for purchase without results returned by the query
bzr revid: qdp-launchpad@openerp.com-20140327103855-8z4kpxth2ldgs1vw
2014-03-27 11:38:55 +01:00
Quentin (OpenERP) 7f5a7031ac [REV] reverted commit 9606, as it was hiding a bug instead of fixing it
bzr revid: qdp-launchpad@openerp.com-20140327103733-ogralnp2ycr4kwsy
2014-03-27 11:37:33 +01:00