Commit Graph

4613 Commits

Author SHA1 Message Date
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
Olivier Dony 34bfa1b44f [MERGE] Forward-port saas-5 up to d9cda97 2014-07-05 01:45:45 +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
Thibault Delavallée f0ef8ac446 [FIX] web_kanban_sparkline, sales_team, stock: use char function field to transmit sparkline data; the data is now correctly dumped into json, and parsed in the widget. 2014-07-04 14:42:38 +02:00
Thibault Delavallée 81a305a018 [FIX] sale: sales_team: fixed use_quotations field named 'opportunities' instead of 'quotations', copy and paste error probably 2014-07-04 08:02:54 +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
Simon Lejeune af4cd36c83 [MERGE] upstream 2014-06-30 17:48:08 +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 fc8592adf2 [FIX] Report: translation fixed, use of 'primary clone' of web.layout and website.layout, minimal template is now a QWeb template 2014-06-27 12:00:49 +02:00
Christophe Simonis 8cbaf52fd3 Revert "Saas 5 report translation fix sle" 2014-06-26 18:14:44 +02:00
Simon Lejeune 42263b814e Merge remote-tracking branch 'odoo/saas-5' into saas-5-report-translation-fix-sle 2014-06-26 17:05:24 +02:00
Simon Lejeune d984bff9cb [IMP] cosmetic changes 2014-06-26 15:56:18 +02:00
Jaydeep Barot 026e38b48f [REM] Unnecessary `size` parameters on char fields 2014-06-25 17:13:43 +02:00
Christophe Simonis e862ff7033 [MERGE] forward port of branch saas-5 up to 4cb5381
Conflicts:
	openerp/addons/base/module/wizard/base_module_upgrade_view.xml
2014-06-22 15:36:10 +02:00
Christophe Simonis 4cb5381dee [MERGE] forward port of branch saas-4 up to 1f20f61 2014-06-22 15:33:22 +02:00
Christophe Simonis 1f20f61ab4 [MERGE] forward port of branch saas-3 up to 75884c3 2014-06-22 15:30:57 +02:00
Martin Trigaux f855f1c162 Merge pull request #325 from odoo-dev/saas-3-opw-608186-acl
[FIX] sale: cannot filter on paid = False (opw 608186)
2014-06-19 16:01:23 +02:00
Amit Vora b0a5e9286d [IMP]rename project_mrp to sale_service 2014-06-17 17:12:49 +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
Géry Debongnie 8202561511 Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged 2014-06-10 11:43:17 +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
Martin Trigaux 0c4bc1cf72 [FIX] sale: keep customer reference in grouped invoice (opw 606523) 2014-06-03 17:15:08 +02:00
Anaël Closson 271885716f [FIX] sale: cannot filter on paid = False 2014-06-03 16:19:05 +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 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
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
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
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
Thibault Delavallée ae89496bbc [MERGE] Sync with trunk 2014-05-14 17:21:54 +02:00
Thibault Delavallée a5311e6900 [MOV] crm: moved css / js related to salesteam to sales_team module; sale_crm: moved data and demo data into
sale and sales_team module.
2014-05-14 14:30:26 +02:00
Thibault Delavallée b24986d8e6 [MERGE] Sync with trunk 2014-05-14 12:51:42 +02:00
Martin Trigaux 583fe74ba2 Forward-port of latest saas-3, up to revision 9455 (rev-id mat@openerp.com-20140514080416-m4t23y0rxx2ot7y6) 2014-05-14 10:37:54 +02:00
Launchpad Translations on behalf of openerp 0159a72661 Launchpad automatic translations update. 2014-05-14 06:20:49 +00:00
Launchpad Translations on behalf of openerp 7564f528e0 Launchpad automatic translations update. 2014-05-14 05:45:54 +00:00
Denis Ledoux 709e22c32a [FIX] sale: sale report view, wrong domain
Quotations are sale.order with state draft and sent
Sale orders are sale.order with state other than draft, sent and cancel
2014-05-13 10:15:01 +02:00
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
Launchpad Translations on behalf of openerp 65736e0644 Launchpad automatic translations update. 2014-05-13 05:59:29 +00:00
Thibault Delavallée e53cadcf2a [FIX] sale: fixed import error about relativedelta 2014-05-12 15:47:12 +02:00
Thibault Delavallée 919bd97509 [MERGE] Sync with upstream (trunk) 2014-05-12 14:56:31 +02:00
Thibault Delavallée 3406b6db39 [CLEAN] sale, sale_crm: cleaning before merging. Cleaned calculation
of default section id + removed duplicated code.
2014-05-12 14:56:01 +02:00
Cedric Snauwaert 9d9cfd585f [FIX]sale_report: change type of field date from date to datetime to match field date on sale_order
bzr revid: csn@openerp.com-20140512114532-726a1z0wqbpz96t8
2014-05-12 13:45:32 +02:00
Thibault Delavallée 443c830bfc [RENAME] sale_team renamed to sales_team. Update module name, file name and reference to the module. 2014-05-12 10:37:47 +02:00
Launchpad Translations on behalf of openerp 1397b7aa34 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075539-empsrh7k5l6q44ln
bzr revid: launchpad_translations_on_behalf_of_openerp-20140510075505-nu0zmfg57i2352lz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070820-8xp1e2jxonp4i750
bzr revid: launchpad_translations_on_behalf_of_openerp-20140503064840-v6n2wyrm1l162bh4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062728-9tmsk2r01vvs3avi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072722-8xpshoxb4um6ef30
bzr revid: launchpad_translations_on_behalf_of_openerp-20140511070841-lboiasc73m8h3fb2
2014-05-11 07:08:41 +00:00
Prashant Panchal (OpenERP) 138ffedbf0 [MERGE]: Merged with addons 2014-05-09 18:47:56 +05:30
Prashant Panchal (OpenERP) ca2bee0865 [IMP]add groups 'base.group_multi_salesteams' 2014-05-09 16:16:07 +05:30
Prashant Panchal (OpenERP) 6c0389279a [IMP]add groups 'base.group_multi_salesteams' on sales team dependent module 2014-05-09 13:13:13 +05:30
Prashant Panchal (OpenERP) b420dc37d3 [MERGE]merge with trunk 2014-05-08 19:14:33 +05:30
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
Antony Lesuisse 56eeefdfda [MERGE] trunk-websit-al-refactor by chm
- allow fiscal position change on sale orders
- public user on website
- simplify website_sale sale.order and shopping cart code
- remove preprocess_request

bzr revid: al@openerp.com-20140507153223-q73u5lhyrfw98o3a
2014-05-07 17:32:23 +02:00
Gery Debongnie 2d924f3e22 [FIX] code cleanup (addon sale)
improves the _sales_count method in product.product by removing try/catch and by using better logic.  Also, removes now useless sales_ids one2many field.

bzr revid: ged@openerp.com-20140507092303-a2g4gq2mq3obelye
2014-05-07 11:23:03 +02:00
Prashant Panchal (OpenERP) e511de45cb [ADD]crm_case_section (view & py file) add in sale module, that file split from sale.py & sale_view.xml 2014-05-07 11:50:06 +05:30
Ravi Gadhia a3e44373d0 Merge with trunk 2014-05-06 14:58:46 +05:30
chm@openerp.com 8065294976 [IMP] sale: add comment on onchange_fiscal_position and update taxes of order lines only if a product is defined
bzr revid: chm@openerp.com-20140506080525-4scwvtk7os8b63d0
2014-05-06 10:05:25 +02:00
chm@openerp.com 9eb7a78866 [MERGE] from trunk
bzr revid: chm@openerp.com-20140505112314-1zbn7ae61mg8xavl
2014-05-05 13:23:14 +02:00
chm@openerp.com 9e176a977e [FIX] website_sale: apply tax position on checkout signup
bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
2014-05-05 11:23:00 +02:00
chm@openerp.com 1a9f3165ce [FIX] sale: change fiscal_position don't change order line taxes; Add onchange_fiscal_position method on sale.order
bzr revid: chm@openerp.com-20140505085755-wewn9xm8bp08ywnd
2014-05-05 10:57:55 +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
Ravi Gadhia 6ccbd2cd82 [IMP] no need to inherit sale.order report we are already in sale/report +change file name for invoice report 2014-05-02 17:23:18 +05:30
chm@openerp.com ee16b014b1 [MERGE] from trunk
bzr revid: chm@openerp.com-20140502095132-kfx40xou73mukr2y
2014-05-02 11:51:32 +02:00
Ravi Gadhia 78204703b0 [IMP] split crm_case_section + create alias from lead 2014-05-02 14:27:50 +05:30
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
Ravi Gadhia 3bfdd859e2 Merge with trunk 2014-05-01 13:12:03 +05:30
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) d7d6833965 [FIX] sale: layout of description page
bzr revid: rim@openerp.com-20140429090502-32u7vf7zntxnoruk
2014-04-29 11:05:02 +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
chm@openerp.com bb2ebf7cb9 [FIX] website_sale: apply fiscal position on change product id and update cart.
[IMP] sale: apply fiscal position of the partner if they are not fiscal position defined

bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
2014-04-28 11:36:09 +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
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
Martin Trigaux 322eebf3f7 [FIX] sale: move demo data from sale to sale_stock
A better fix would be to create a sale_procurement module (sale_stock has sale, procurement and stock as dependecies) but a bit overkill for simple demo data

bzr revid: mat@openerp.com-20140422105039-vqvxejd123cmtc0s
2014-04-22 12:50:39 +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
Randhir Mayatra rma-openerp 62cd1a6487 [MERGE] merge with latest trunk 2014-04-22 14:21:34 +05:30
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
Randhir Mayatra rma-openerp 27ee024847 [IMP] optimize code 2014-04-22 12:53:03 +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
Gery Debongnie a17c16a660 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417110726-8w4oktk7ml416ld7
bzr revid: ged@openerp.com-20140417130144-42bkw3f55xosxnks
2014-04-17 15:01:44 +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
DJ Patel 4c1a345ad4 [Merge] Merged with trunk.
bzr revid: mdi@tinyerp.com-20140416043234-ygtv29jxhiq1io0e
2014-04-16 10:02:34 +05:30
Gery Debongnie f57b767361 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
Randhir Mayatra rma-openerp e25229a6da [IMP] update depends on sale_team and sale 2014-04-15 16:08:37 +05:30
Randhir Mayatra rma-openerp 733f344ff6 [IMP] add 'report' in sale dependancy
bzr revid: rma@tinyerp.com-20140414120915-3huithw6481rss0j
2014-04-14 17:39:15 +05:30
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
Richard Mathot (OpenERP) 15725997dd [MERGE] Sync with trunk
bzr revid: rim@openerp.com-20140414090336-vc5283odv5f612es
2014-04-14 11:03:36 +02:00
Randhir Mayatra rma-openerp e8f488065a [MERGE] merge with latest trunk and resolve conflicts 2014-04-14 14:06:31 +05:30
Launchpad Translations on behalf of openerp 001a034e58 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094159-mhy3v2prb3ctx32k
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412094217-3u3f03f0wjhbzyo4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140413062047-z833pejjrtuhfygs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140414055948-intynzk8l823ukei
2014-04-14 05:59:48 +00: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
Randhir Mayatra rma-openerp 6da28202f3 [MERGE] merge with latest trunk 2014-04-11 12:36:24 +05:30
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
Launchpad Translations on behalf of openerp 63e9150cff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140411055930-7coykr7rveqsucp3
2014-04-11 05:59:30 +00:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
Denis Ledoux 7715bf1823 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9969 revid:dle@openerp.com-20140409162932-y5fxd5wbojing2t2
bzr revid: dle@openerp.com-20140409163132-n3apqh6nvfg2qof9
2014-04-09 18:31:32 +02:00
Ravish (Open ERP) 31c7c33260 [imp]improve the code 2014-04-09 19:10:28 +05:30
Denis Ledoux 32f4824434 [MERGE][FIX] sale: sale order report, pto in invoice template should not cover the whole document
Courtesy of Stefan Rijnhart (Therp)

bzr revid: dle@openerp.com-20140408193910-2vztatyowndyasj9
2014-04-08 21:39:10 +02:00
DJ Patel c20483a1dd [FIX] sale : Don't allow line creation in confirmed sale oder.
bzr revid: mdi@tinyerp.com-20140408053552-ovo33f2nkhaj6goe
2014-04-08 11:05:52 +05:30
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
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
Simon Lejeune e1bf5bd97c [IMP] Report: renamed 'render_doc' method as 'translate_doc' for better understanding and added it a 'lang_field' attribute to explicitely set the lang. Adapted report_invoice, report_saleorder, report_overdue and report_intrastatinvoice this way.
bzr revid: sle@openerp.com-20140408134953-vql9ft8cosoanixt
2014-04-08 15:49:53 +02:00
Simon Lejeune 4983f86d81 [MERGE] trunk
bzr revid: sle@openerp.com-20140407174534-pk6b5lozvik78fom
2014-04-07 19:45:34 +02:00
Simon Lejeune dc8246eb03 [ADD] sale_layout module allowing to set categories and subtotals on invoice and sale order
bzr revid: sle@openerp.com-20140404112308-aopihnefnf55b4er
2014-04-04 13:23:08 +02:00
Launchpad Translations on behalf of openerp 8f174e13bd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
2014-04-04 07:07:59 +00:00
Christophe Simonis db6fb31870 [MERGE] forward port of branch 7.0 up to revid 9954 chs@openerp.com-20140403153129-jq9zc7ityoy25c73
bzr revid: chs@openerp.com-20140403155904-ya5mas5s3g7ivihb
2014-04-03 17:59:04 +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) ff4726ea7d [MERGE] merged trunk up to revision 9281
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
Launchpad Translations on behalf of openerp 4612b417af Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140403060213-netdplm9jzfr9yy6
2014-04-03 06:02:13 +00:00
Ravish (Open ERP) 194005512d [update with trunk] 2014-04-01 12:54:14 +05:30
Martin Trigaux 7ee65aa181 [FIX] sale: remove useless write call (problematic when invoice on delivery order)
bzr revid: mat@openerp.com-20140331104448-4omzqnist6wlmakd
2014-03-31 12:44:48 +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
Yogesh Parekh (OpenERP) 9aadda1e1e [MERGE]: Merge with addons branch
bzr revid: ypa@tinyerp.com-20140331095310-wkmxt02x6l85zho0
2014-03-31 15:23:10 +05:30
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
Ravish (Open ERP) 7699504d62 [Add new sale_team module] 2014-03-28 15:28:35 +05:30
Launchpad Translations on behalf of openerp 598cf8d9b3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140328064440-1ja0p23itklkg7yk
2014-03-28 06:44:40 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
Quentin (OpenERP) e0b27b4ee8 [MERGE] merged trunk up to revision 9251
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
Denis Ledoux e61d12bfa7 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9160 revid:dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
bzr revid: dle@openerp.com-20140325112909-zpfi67tx8yfxwnqe
2014-03-25 12:29:09 +01:00
Denis Ledoux 02459f8d4a [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux 8310cd1920 [FIX] sale: make invoice for SO grouped by partner based on partner_invoice_id instead of just partner_id
For two sale order, if the partner_id were different but the partner_invoice_id were identical, the make invoice grouped by partner created two different invoices

bzr revid: dle@openerp.com-20140325103226-vusygdpd74yha91m
2014-03-25 11:32:26 +01:00
Randhir Mayatra rma-openerp 96ea9392aa [IMP] convert button into stat button for products
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +01:00
Denis Ledoux f4b1d23cf2 [MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9159 revid:dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
2014-03-24 12:03:49 +01:00
Denis Ledoux 04f632820b [FIX] sale: trigger signal manual invoice for make invoices wizard (not advance)
bzr revid: dle@openerp.com-20140324103427-yckncrnynvs5si8i
2014-03-24 11:34:27 +01:00
Randhir Mayatra rma-openerp b51066b500 [IMP] convert button into stat button for customer
bzr revid: rma@tinyerp.com-20140320134414-mk1ie8okynrtudsq
2014-03-20 19:14:14 +05:30
Launchpad Translations on behalf of openerp 948799e259 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315070651-iyi1g70tarcqvhdc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140315064235-n9sb0125g9bboyb4
bzr revid: launchpad_translations_on_behalf_of_openerp-20140316054224-hr4a70bglfizxqyy
2014-03-16 05:42:24 +00:00
Yogesh Parekh (OpenERP) c4424b597d [MERGE]: Merge with addons
bzr revid: ypa@tinyerp.com-20140312095556-d0pmfd7kw9fyy7u2
2014-03-12 15:25:56 +05:30
Christophe Simonis d504764eff [MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Yogesh Parekh (OpenERP) 9338207e1f [IMP]: Improve reference terms for partner
bzr revid: ypa@tinyerp.com-20140311094911-7oc1il3jl2ktlb09
2014-03-11 15:19:11 +05:30
Denis Ledoux 4235dc8e88 [REVERT]9882 revid:jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
While it seems right to only show the partner addresses in invoice and shipping addresses, this fix will prevent to use sibling addresses (the address of another contact in the same company), which is a requirement for several users. Therefore, this fix causes more problems than it resolves. 

Moreover, these addresses are displayed on the invoice form as following: Company Name / Partner Name / Address Name. Therefore, if you want to change the address while seeing only the partner addresses, you just have to remove the "Address Name", leaving "Company Name / Partner Name".

bzr revid: dle@openerp.com-20140310133314-5mv4h2h5zmqlw4d2
2014-03-10 14:33:14 +01:00
Denis Ledoux c2ba11e72e [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9885 revid:dle@openerp.com-20140310114026-r0ijm0m36su19wn7
bzr revid: dle@openerp.com-20140310122101-gicombyc5ii0yz6a
2014-03-10 13:21:01 +01:00
Juan Rial f631757f37 [FIX] [MERGE] [SALE] Filter invoice and ship address on sales order to contacts of the selected customer (#592166)
bzr revid: jri@openerp.com-20140307160945-r2t5pbl2bb7yaw9n
2014-03-07 17:09:45 +01:00
Launchpad Translations on behalf of openerp e231045095 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061409-nvr56r44q6smklxz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140305055718-w3c9kzsncncpu12w
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061519-n2qbjt3fe7l104aw
2014-03-06 06:15:19 +00:00
Denis Ledoux 6deae9e9ea [FIX] *: replace various widgets selection by option no_create, as the purpose of these widgets selection were to actually hide the create and edit and quick create
bzr revid: dle@openerp.com-20140306113021-r280g41vkdyf5ew8
2014-03-06 12:30:21 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Sunil Sharma (OpenERP) dd4813e360 [mrg]:lp:openobject-addons
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
2014-03-04 12:09:37 +05:30
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Simon Lejeune 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Christophe Simonis 4b72678bc7 [MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs
2014-02-20 17:38:15 +01:00
Christophe Simonis d5106a4d34 [MERGE] forward port of branch saas-2 up to revid 9136 dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
bzr revid: chs@openerp.com-20140220154517-6y531n1mqtnfnsmr
2014-02-20 16:45:17 +01:00
Denis Ledoux 8edb7c556b [FIX]sale: post message of mail_thread only accept 0, False, an ID or a list with one ID
bzr revid: dle@openerp.com-20140219170746-3yjvjyc2wwrb7rvd
2014-02-19 18:07:46 +01:00
Olivier Dony ed355097fe [FIX] sale: avoid resetting groups for editable mode at each update/upgrade (no noupdate flag on this record)
bzr revid: odo@openerp.com-20140218174805-4qak0esqpikt372q
2014-02-18 18:48:05 +01:00
Simon Lejeune fabc1cdd40 [FIX] renamed ir.actions.report.paperformat model to report.paperformat, renamed html_skeleton to html_container in report layouts and renamed paperformat.py file to report_paperformat.py
bzr revid: sle@openerp.com-20140218155347-tfxlndg9wgaw0bv1
2014-02-18 16:53:47 +01:00
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
2014-02-17 06:03:28 +00:00
openerp-sle f51ffe6227 [FIX] Minor fixes in sale and tax views
bzr revid: openerp-sle@openerp-sle.home-20140214094834-x3trvtnbmffo1dtb
2014-02-14 10:48:34 +01:00
openerp-sle a2805ee6d7 [FIX] Sale: QWeb action returned when clicking on print button on form view
bzr revid: openerp-sle@openerp-sle.home-20140212230002-4e1rsmeutg45h237
2014-02-13 00:00:02 +01:00
openerp-sle 12e9d218b0 [IMP] Sale order report converted to QWeb
bzr revid: openerp-sle@openerp-sle.home-20140212182247-0ahbbrgob4ssz9bn
2014-02-12 19:22:47 +01:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Launchpad Translations on behalf of openerp 9554c144ff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
2014-02-12 06:23:57 +00:00
Cedric Snauwaert 9b249181e3 [MERGE]merge with latest trunk
bzr revid: csn@openerp.com-20140210161556-qq52vvhdegyda7k6
2014-02-10 17:15:56 +01:00
Denis Ledoux 0043f81e33 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9824 revid:dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
bzr revid: dle@openerp.com-20140210141704-sjzjwhe7fh5gszxr
2014-02-10 15:17:04 +01:00
Denis Ledoux 6e3d193517 [FIX] sale, sale_stock: send by email button visible when sent, progress or manual
+ remove 'invoiced' from statusbar_visible, as there is no such state
+ proper inherit in sale_stock form view

bzr revid: dle@openerp.com-20140210134603-ck0jr56xhl8xgzg2
2014-02-10 14:46:03 +01:00
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts.
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
Launchpad Translations on behalf of openerp 8d85c23e4a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00
Quentin (OpenERP) f9d3e8a39e [REF] some refactoring, bug fixes made during code review
bzr revid: qdp-launchpad@openerp.com-20140207111349-2zjysk3w1p0daeaj
2014-02-07 12:13:49 +01:00
Quentin (OpenERP) 860cdf9d34 [MERGE] main trnk-wms branch
bzr revid: qdp-launchpad@openerp.com-20140207085946-iwwnyivpsl6r2af8
2014-02-07 09:59:46 +01:00
Launchpad Translations on behalf of openerp f6696383d6 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140207071400-b3u1081zn9icp7xw
2014-02-07 07:14:00 +00:00
Thibault Delavallée 1b13217838 [MERGE] sales/crm: minor improvements in account_analytic_analysis, crm, event_sale, hr_timesheet_invoice, sale views
bzr revid: tde@openerp.com-20140205160347-nptajwoxfl5ylfa9
2014-02-05 17:03:47 +01:00
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
2014-02-04 06:48:35 +00:00
Quentin (OpenERP) 753f7541db [MERGE] main trunk
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Antony Lesuisse 4b30f1fcbd [MERGE] trunk-website-al
bzr revid: al@openerp.com-20140131005157-jkf8hz6fh2buml2c
2014-01-31 01:51:57 +01:00
Gery Debongnie 9cdcf812a6 [MERGE] merge from trunk into local branch
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
2014-01-30 14:52:51 +01:00
Gery Debongnie 7fd82bc83b [FIX] remove references to 'month' account.invoice.report field in sale/board_sale_view.xml. That field was removed in the model (addon sale)
bzr revid: ged@openerp.com-20140130091816-y7w38epdk440t44m
2014-01-30 10:18:16 +01:00
Sunil Sharma (OpenERP) b2ac002e1b [MRG]:merge lp:openobject-addons
bzr revid: sunilsharma.sharma07@gmail.com-20140130044953-qfg8wbm6835hi9dz
2014-01-30 10:19:53 +05:30
Christophe Simonis c202dc1c52 merge upstream
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Christophe Simonis 731019154a [MERGE] forward port of branch saas-2 up to revid 9109 dle@openerp.com-20140129171022-wf6244k90lpncmah
bzr revid: chs@openerp.com-20140129184703-ypd7iqnor5m5lr3d
2014-01-29 19:47:03 +01:00
Sunil Sharma (OpenERP) 685121bea3 [rem]:sale and crm :remove image
bzr revid: sunilsharma.sharma07@gmail.com-20140129133115-mqozdx23ctzbmct5
2014-01-29 19:01:15 +05:30
Sunil Sharma (OpenERP) f7431f7a9d [remove]sale:remove sale dashboard description and image
bzr revid: sunilsharma.sharma07@gmail.com-20140129120425-kk2g4hg3yxb4fwki
2014-01-29 17:34:25 +05:30
Sunil Sharma (OpenERP) 80be3a2c53 [imp]sale:remove comment line
bzr revid: sunilsharma.sharma07@gmail.com-20140129113252-i71mk96ohkpp3zg8
2014-01-29 17:02:52 +05:30
Sunil Sharma (OpenERP) 4c0f46178e [remove]sale:remove sale dashboard
bzr revid: sunilsharma.sharma07@gmail.com-20140129113004-y2gndgsqkif3g43k
2014-01-29 17:00:04 +05:30
Launchpad Translations on behalf of openerp 4d3a623af7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128070310-721zmkmw0ocyz6im
bzr revid: launchpad_translations_on_behalf_of_openerp-20140129060326-647er2mw0mfn2j5s
2014-01-29 06:03:26 +00:00
Antony Lesuisse dc439ea9ca [FIX] ir.model.data conversion typo
bzr revid: al@openerp.com-20140129053533-dcx97b9opmqzrhmw
2014-01-29 06:35:33 +01:00
Antony Lesuisse 6b7d9f2bac [IMP] ir.model.data new api
bzr revid: al@openerp.com-20140129030853-aqm4nu8buhj9gu7n
2014-01-29 04:08:53 +01:00
Antony Lesuisse 033c38c304 [MERGE] trunk
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Olivier Dony 39c27c72d0 [MERGE] Sync with trunk rev. 9064 rev-id ged@openerp.com-20140127161718-uo6pperke86pqq5v
bzr revid: odo@openerp.com-20140128175835-jannyh3cv3gi1sxn
2014-01-28 18:58:35 +01:00
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Raphael Collet 4c2cc018b1 [FIX] in ir_model_data.get_object(), rename parameter 'check' into 'raise_exception'
bzr revid: rco@openerp.com-20140127152112-s9ft7q9xlixedjew
2014-01-27 16:21:12 +01:00
Gery Debongnie e4cb7e5aa1 [FIX] change the name of the sales filter to Sales -> this is the name required in some other places that inherits it (addon sale)
bzr revid: ged@openerp.com-20140127143219-2ljcrieylv3pdz8c
2014-01-27 15:32:19 +01:00
Gery Debongnie fcb9f7a76e [IMP] improves the Sales Analysis reporting views (add filters and changes the row/col definitions) in pivot table mode (addon sale)
bzr revid: ged@openerp.com-20140127110102-so4cma7679uvdwtk
2014-01-27 12:01:02 +01:00
Raphael Collet b8fec90fb4 [FIX] sale: ir_model_data.get_object(..., check=False) may return False
bzr revid: rco@openerp.com-20140127103505-kujpcjpgr5rdxni9
2014-01-27 11:35:05 +01:00
Launchpad Translations on behalf of openerp d9cdc8564c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061252-9jm03vlbr13ofqo9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055652-0p71divui34v1c1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140124062440-hx0z2e4sd6nz7exc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051449-rlunde7qysqsh1b1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140125064003-v340hiykcngjg9ue
bzr revid: launchpad_translations_on_behalf_of_openerp-20140126051541-9fnyw12nex5poeth
bzr revid: launchpad_translations_on_behalf_of_openerp-20140127054606-1jb6usf6pj7gy1xl
2014-01-27 05:46:06 +00:00
Antony Lesuisse fe59f115c0 [FIX] sale/res_config get_object raise by default
bzr revid: al@openerp.com-20140126194921-ef6uqsgqqmbar0du
2014-01-26 20:49:21 +01:00
Fabien Pinckaers fafc132188 [IMP] website_quotation -> website_quote
bzr revid: fp@tinyerp.com-20140125230847-qzls5kjbxj51scze
2014-01-26 00:08:47 +01:00
Fabien Pinckaers b15dbfa3a6 [IMP] mini imp
bzr revid: fp@openerp.com-20140125123758-4fhewd19ib38oal3
2014-01-25 13:37:58 +01:00
Denis Ledoux 1fb1a6f2af [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00
Cedric Snauwaert 08cf92d5a8 [FIX]sale order workflow: fix problem when clicking on ignore delivery exception
bzr revid: csn@openerp.com-20140124092758-tur7cs4d6br30x48
2014-01-24 10:27:58 +01:00
Cedric Snauwaert 1e662896fe [FIX]when copy sale_order, don't copy procurement_group_id
bzr revid: csn@openerp.com-20140123162141-rjd2vyml1d65ayn3
2014-01-23 17:21:41 +01:00
Cedric Snauwaert 8c00eddd04 [FIX]sale order, when in shipping exception, don't cancel procurement, re-run it instead. Also run of procurement should take into account previously done move for quantities
bzr revid: csn@openerp.com-20140123160638-4dgq1h1yugt6m6zt
2014-01-23 17:06:38 +01:00
Denis Ledoux 27224c9b9e [FIX] sale, purchase, sale_stock: on orders lines, on product changed, change the uom (even if the uom is in the same category)
bzr revid: dle@openerp.com-20140123103505-7pm9526ot2f5u7wa
2014-01-23 11:35:05 +01:00
Launchpad Translations on behalf of openerp 805d3757e9 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140123055732-ggft6ftma1kfpaq6
2014-01-23 05:57:32 +00:00
ajay javiya (OpenERP) 2577be53ac [MERGE]: with main
bzr revid: aja@tinyerp.com-20140123050930-nxq5nnc3y6q0i2lv
2014-01-23 10:39:30 +05:30
Launchpad Translations on behalf of openerp d5bc07f898 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140122061335-z6h1dn3yd94l8850
2014-01-22 06:13:35 +00:00
Pooja Zankhariya (OpenERP) 6d105922bd [IMP]Removed . near Allow online quotation, Added Partner to Quotation view.
bzr revid: pza@tinyerp.com-20140121135849-59hs0usf3i36efox
2014-01-21 18:58:49 +05:00
Thibault Delavallée b3a4778f26 [IMP] product variant: removed override of fields_view_get and use a "one group or another"
behavior for product variant. Users are either in group_product_mono or
group_product_variant, allowing to tune the form view according to the
group the user belongs to.
product: added group_product_mono group
sale: added set_group_product_variant method that adds or remove the
group_product_mono according to the group_product_variant being unchecked
or checked.
product: updated form view accordingly

bzr revid: tde@openerp.com-20140121105046-zkbs778upjg0lpyr
2014-01-21 11:50:46 +01:00
Launchpad Translations on behalf of openerp 698e2de138 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140121062040-gq8r12g3ypksxa4t
2014-01-21 06:20:40 +00:00
Quentin (OpenERP) 3f8ec15bbe [MERGE] stock, sale, sale_stock: several usability problem fixed.
lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: qdp-launchpad@openerp.com-20140120160303-v5hmfmb6roeg56v6
2014-01-20 17:03:03 +01:00
Quentin (OpenERP) b6a51daf90 [MERGE] merged csn branch with fixes of access rights on prices.history table
bzr revid: qdp-launchpad@openerp.com-20140120150334-8h6jg5wkwklc2c42
2014-01-20 16:03:34 +01:00
Quentin (OpenERP) fc93025818 [MERGE] merged trunk
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Launchpad Translations on behalf of openerp 28d79433c3 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070457-rn2tgdxis2fi3nqo
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055822-ajy043mntc4jr407
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055854-z7wtyb24c5t8kcmj
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070538-2xm86ece1aate8u9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140119055932-sa6vrp2g8ua3u88e
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055948-lwcyqcfutgamwac1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140118070546-d89xqw56zou7e9p9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140120055955-6wrdxqy1018mo7jq
2014-01-20 05:59:55 +00:00
Cedric Snauwaert 9cb7aab2d0 [FIX]access right for prices.history (should be the same as the one for product)
bzr revid: csn@openerp.com-20140117135034-8m7798nqu1spz370
2014-01-17 14:50:34 +01:00
Pooja Zankhariya (OpenERP) 722aee5336 [MERGE]Merge with Parent
bzr revid: pza@tinyerp.com-20140117062056-yaw069hktnsk3iwj
2014-01-17 11:20:56 +05:00
Denis Ledoux 5649e0bbf2 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
2014-01-16 17:14:15 +01:00
Gery Debongnie 00c6d55ac9 [MERGE] merge trunk into local branch
bzr revid: ged@openerp.com-20140116144326-8kwqab71zp8s7a8e
2014-01-16 15:43:26 +01:00
Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
Christophe Simonis 91aaaec0a5 [MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
Martin Trigaux 2aa8a38447 [IMP] sale,purchase order: order the field based on date_order instead of name
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)

bzr revid: mat@openerp.com-20140115140527-pztwh3kl6y9y7jbe
2014-01-15 15:05:27 +01:00
Cedric Snauwaert d0cea6ac39 [FIX]rename group_stock_production_lot to match correct group, remove few extra spaces to match standard.
Fix traceback on onchange: product_packaging_change and remove setting default package when creating SOL

lp bug: https://launchpad.net/bugs/1269045 fixed

bzr revid: csn@openerp.com-20140115130123-3ragkt93ukfrfhmq
2014-01-15 14:01:23 +01:00
Pooja Zankhariya (OpenERP) ba458f6abc [MERGE]Merge with Parent
bzr revid: pza@tinyerp.com-20140115123052-n9pfmaoh5jzev28d
2014-01-15 17:30:52 +05:00
Christophe Matthieu 320a0bc28c [IMP] website/website_sale: Use group to display shipping address in frontend like the backend. Use group for product facet caracteristique (backend/frontend). Customize templates is displayed function of groups of ir.ui.view templates.
bzr revid: chm@openerp.com-20140115110547-v0nllq0f800tlhpg
2014-01-15 12:05:47 +01:00
Launchpad Translations on behalf of openerp 5334330d9d Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062126-ypg4xp33rspusnts
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062205-ov2axame3z00jkii
2014-01-15 06:22:05 +00:00
Mahendra Barad (OpenERP) 6b90f0a6d5 [IMP]fix typo and improved layout
bzr revid: mba@tinyerp.com-20140113103617-vu9hftagrqx0dqa2
2014-01-13 16:06:17 +05:30
Gery Debongnie 0c24b69db2 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140113081030-74nfutdr5le70dz4
2014-01-13 09:10:30 +01:00
Stephane Wirtel bea411bb98 [IMP] Backport one feature from website: this feature allows to specify a file
path on the field tag fetching the right file instead of using the base64
encoded file in the field.

<field name="image" type="base64" file="base/static/img/main_partner-image.png" />

bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
Launchpad Translations on behalf of openerp ad17716632 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140109053828-gmi203xa8tx1nnnp
2014-01-09 05:38:28 +00:00
Thibault Delavallée 49c0b7a820 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
Launchpad Translations on behalf of openerp b1af63310c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061324-aw7yvvnjapbx5x1i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053354-9ybfurq6yvrliqge
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054728-1db5iqqokg67bcyr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052619-5szmeohg88k0m4xt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054325-pww3zkiyzxll4qy7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054504-671epcsd8458kil8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062350-h5v8idg6hlix6rnx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061853-bndte11d6k8po640
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054743-exo0ixnpjkfwfstl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050440-fme1x3f2g4s1dxqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062427-4v5wusiplrcj4jjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061934-r5xq4gfoy22w6nll
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054800-delmrxbtcvm3xxyw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050503-xu0r3lopkkfn20ca
2014-01-06 05:05:03 +00:00
Gery Debongnie bc19dec67c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140102090034-q44kafh11u0frjv2
2014-01-02 10:00:34 +01:00
Launchpad Translations on behalf of openerp e0951d6e18 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
Gery Debongnie 9477cacd5f [IMP] removes old tree view in reporting (sales, sales_crm, sales_stock) and replaces them by the new graph view in pivot mode by default (addon sale, sale_crm, sale_stock)
bzr revid: ged@openerp.com-20131231111824-1altk73m9l4iszkq
2013-12-31 12:18:24 +01:00
Launchpad Translations on behalf of openerp 67e479e96e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
Quentin (OpenERP) f5718efa6e [MERGE] merged with trunk
bzr revid: qdp-launchpad@openerp.com-20131230102802-y1ux8470wxnj4yfr
2013-12-30 11:28:02 +01:00
Gery Debongnie bdcb7fcc17 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20131227152252-5kz11jpespxg1h5w
bzr revid: ged@openerp.com-20131230090844-9vugoov6jsc6z5j0
2013-12-30 10:08:44 +01:00
Gery Debongnie 9dfb5de2f8 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20131224112327-r1evm1pcw2gpn8dh
bzr revid: ged@openerp.com-20131226132625-33fgmyb0fbu0c9ia
2013-12-26 14:26:25 +01:00
Gery Debongnie ae13bea0d8 [IMP] changes the xml description of the graphs to use the new graph view (and to make sure the result is as close as possible) (addon sale)
bzr revid: ged@openerp.com-20131224102942-5g4gchmgyloo2s06
2013-12-24 11:29:42 +01:00
Martin Trigaux 54be818a3b [MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
Thibault Delavallée e883b15c48 [FIX] sale, delivery: _amount_all function used in function field is now wrapper. Indeed as
we give the function pointer when creating the fields, inheritance is not taken into
account. This is done by adding a wrapper that calls _amount_all, using this time correct
inheritance.

bzr revid: tde@openerp.com-20131218131942-9lzrxbscb4lu4rj8
2013-12-18 14:19:42 +01:00
Quentin (OpenERP) b2fed7e0b2 [FIX] sale: after a shipping exception, when recreating the procurements from a SO, cancel first existing ones (if any)
bzr revid: qdp-launchpad@openerp.com-20131218101717-c4womsacvkkzmr37
2013-12-18 11:17:17 +01:00
Launchpad Translations on behalf of openerp 94b4618c13 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054553-py8zfwrk3bir6m1l
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212055820-zh0fqpweezvphdc6
bzr revid: launchpad_translations_on_behalf_of_openerp-20131213064308-hil3cycv38im8qds
bzr revid: launchpad_translations_on_behalf_of_openerp-20131215054616-uyc9y42oetvmq1cs
bzr revid: launchpad_translations_on_behalf_of_openerp-20131216053557-w3gf0jlw5wrtzllr
2013-12-16 05:35:57 +00:00
Thibault Delavallée fab63158a1 [CLEAN] sale: removed code that should not lie here. website code has nothing to do in the base sale module. website_sale: renamed website_sale file into sale_order and added the get_website_data method.
bzr revid: tde@openerp.com-20131213110629-rhgpqpy2dj03ng8h
2013-12-13 12:06:29 +01:00
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Launchpad Translations on behalf of openerp 45e34f2f6b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
2013-12-12 05:15:25 +00:00
Denis Ledoux 942a10f2b3 [REVERT] rev 9007 dle@openerp.com-20131122150606-ruqe2l0e7gn84upf
default_model and default_res_id were not present when doing this fix, because in the web client, we prevented the propagation of the context keys beginning with "_default" in some cases.
The fact is that, in this specific case, the keys "default_" should not have been removed. This has been fix in web client in 
rev 3892 revid:chs@openerp.com-20131211163609-i3s2mlncf5n91uda

Besides, active_model cannot be used here, as active_model is not 'sale.order' but the model of the wizard.

bzr revid: dle@openerp.com-20131211171429-6bxuh7o4ueiy9dd1
2013-12-11 18:14:29 +01:00