pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,144 Commits 1 Branch 0 Tags
ed7ee4df522fd71b63e809f62a07db8ea30210ce
Commit Graph
82144 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gery Debongnie 7fc2afc516 [FIX] properly handles the situation where a user selected twice the same field in the search view groupbys (it simply added the field twice to groupbys instead of removing it (addon web_graph) 
bzr revid: ged@openerp.com-20131219125422-n2rpzbekyg7e0eyh
 2013-12-19 13:54:22 +01:00
Thibault Delavallée aa81e66039 [FIX] project_issue_sheet: worklog responsible should be the current user and not the issue responsible user 
bzr revid: tde@openerp.com-20131219123128-u0nmoait1cysjgv3
 2013-12-19 13:31:28 +01:00
Thibault Delavallée 38e22d1808 [MERGE] [IMP] website_sale_delivery: make the module effectively works. 
- added support in the front-end to choose and carrier and update the quotation
- added override of payment controller in website_sale_delivery to handle the carrier
and recompute the amount and details
- some code cleaning
- added amount_delivery field in sale.order, that is the amount related to the
delivery
- added some wrappers on _amount_all method of the sale.order model, in order to be able to use inheritance for this method
- fixed shipping values management in website_sale + fixed shipping partner finding
- improved the cart to display only product lines, the delivery amount is displayed below the quotation total

[FIX] email_template: fixed a bug with pre-loading the template that was preventing to send a quotation by email

bzr revid: tde@openerp.com-20131219112219-kjvzfukcfur6f8g5
 2013-12-19 12:22:19 +01:00
Gery Debongnie 5e1aebc4b5 [REF] simplify the format_data method in pivot table (addon web_graph) 
bzr revid: ged@openerp.com-20131219111606-u140yaf9y56q1uhg
 2013-12-19 12:16:06 +01:00
Thibault Delavallée 86fc66e797 [FIX] website_sale: checkout process: fixed carrier choice redirection 
bzr revid: tde@openerp.com-20131219105122-awib6gys6uklbvxa
 2013-12-19 11:51:22 +01:00
Frédéric van der Essen eea3942247 [MERGE] from trunk 
bzr revid: fva@openerp.com-20131219104529-pm5covlh6uvo992d
 2013-12-19 11:45:29 +01:00
Thibault Delavallée 348a2bda96 [FIX] website_sale: get_total_quantity -> get_number_of_products 
[FIX] website_sale: fixed domain to find the shipping_partner_id

bzr revid: tde@openerp.com-20131219103732-84nrt5xlqyqbwsns
 2013-12-19 11:37:32 +01:00
Thibault Delavallée e2b07d5d7d [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131219102240-43nvqj9hkzn5ymt2
 2013-12-19 11:22:40 +01:00
ajay javiya (OpenERP) f00f358f77 [REM]: remove unwanted methods and clean code 
bzr revid: aja@tinyerp.com-20131219101210-tlvhlogviruzyqvn
 2013-12-19 15:42:10 +05:30
Thibault Delavallée 8030688084 [FIX] mass_mailing: opening the composer when sending a new wave should not have the res_id 
linked to the campaign. As we are working with mass mailing, it should be False; ids will come
from active_ids / active_domain.

bzr revid: tde@openerp.com-20131219100041-85mbafgk05u8naud
 2013-12-19 11:00:41 +01:00
Thibault Delavallée 40994c2966 [FIX] mass_mailing: when creating a new wave from the mass mailing campaign 
kanban view, add the campaign in default

bzr revid: tde@openerp.com-20131219095729-k5tsvmkqm2mdsnza
 2013-12-19 10:57:29 +01:00
Gery Debongnie a41835e296 [REF] refactoring in progress... simplify the load_data and format_data methods in pivot table (addon web_graph) 
bzr revid: ged@openerp.com-20131219095708-c164shdvv59hyj9l
 2013-12-19 10:57:08 +01:00
Fabien Meghazi af1e65ffdb [IMP] Use cursor: text for editable .btn's 
bzr revid: fme@openerp.com-20131219093410-lgr1f54nehaz9fk0
 2013-12-19 10:34:10 +01:00
Fabien Meghazi 375e440c2e [ADD] Markers for vim 
bzr revid: fme@openerp.com-20131219093329-s5oumfhwyw0pevfy
 2013-12-19 10:33:29 +01:00
Gery Debongnie dd71f5e84b [REF] small improvement to simplify two similar methods in pivot.js. goal is to prepare a larger refactoring (addon web_graph) 
bzr revid: ged@openerp.com-20131219084722-00p29m61vu51rdbb
 2013-12-19 09:47:22 +01:00
Gery Debongnie 007dfea702 [REF] small refactoring, it simplify the make_cells method in pivot.js (addon web_graph) 
bzr revid: ged@openerp.com-20131219080339-7aqnuibtfk1y71a3
 2013-12-19 09:03:39 +01:00
Jignesh Rathod (OpenERP) 0365981a72 [ADD] Account : Set default supplier on partner for Bank Statements. 
bzr revid: jir@tinyerp.com-20131219072442-d8a5nl052x2wxo1h
 2013-12-19 12:54:42 +05:30
Launchpad Translations on behalf of openerp 64cc283264 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061541-j0v5712t55sdiqb6
 2013-12-19 06:15:41 +00:00
Launchpad Translations on behalf of openerp 0c5d29097c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219053903-g82qo7aa2trdg2yd
 2013-12-19 05:39:03 +00:00
ajay javiya (OpenERP) 7ec71f382b [REM]: static layout 
bzr revid: aja@tinyerp.com-20131219053648-kfk8yl03wa7kt2mb
 2013-12-19 11:06:48 +05:30
Fabien Meghazi b180d69808 [IMP] Better events naming for EditorBar height related stuff 
bzr revid: fme@openerp.com-20131218201619-vja6dv0sctokep3b
 2013-12-18 21:16:19 +01:00
jke-openerp dc7660414a [FIX] Use superuser to upate users token from google_calendar.set_all_token 
bzr revid: jke@openerp.com-20131218174931-q0nz4xji5metspoz
 2013-12-18 18:49:31 +01:00
Fabien Meghazi 9abcc28884 [IMP] Set EditorBar height programmatically 
bzr revid: fme@openerp.com-20131218173915-ds5jeyfypbaefrqf
 2013-12-18 18:39:15 +01:00
Martin Trigaux 07f2a7c1f9 [MERGE] forward port of latest saas-2 until rev 3893 dle@openerp.com-20131218112416-2vtaq442qo8opq4u 
bzr revid: mat@openerp.com-20131218165033-4djghawrzllkeckg
 2013-12-18 17:50:33 +01:00
jke-openerp 1a3cb3dcf8 [TYPO] Remove warning 
bzr revid: jke@openerp.com-20131218160827-0bv1vxcux22p4ioa
 2013-12-18 17:08:27 +01:00
Martin Trigaux 79f716c70f [MERGE] forward port of latest saas-2 until rev 4996 dle@openerp.com-20131218123130-vlejjv7r2klkzoj0 
bzr revid: mat@openerp.com-20131218160041-58x5kij4v7earagu
 2013-12-18 17:00:41 +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
Gery Debongnie d7fdeec72f [REF] refactors bar_chart method in graph widget. basically, it removes 80 duplicated lines (addon web_graph) 
bzr revid: ged@openerp.com-20131218154949-9jno1wb4s549jyl7
 2013-12-18 16:49:49 +01:00
Xavier Morel 1b76c66930 [MERGE] fixes for non-direct IME 
bzr revid: xmo@openerp.com-20131218152626-kexq1wudvjwnh962
 2013-12-18 16:26:26 +01:00
ddm 2381c44441 [IMP] UI test runner code doc 
bzr revid: ddm@openerp.com-20131218152352-mclkpnjpzvqsibqh
 2013-12-18 16:23:52 +01:00
Gery Debongnie 1323c2c25b [IMP] adds stacked/grouped setting to chart widget (addon web_graph) 
bzr revid: ged@openerp.com-20131218152048-36no38nud6a5ft10
 2013-12-18 16:20:48 +01:00
ddm 50ab1e551e [IMP] Cleanup UI tests 
bzr revid: ddm@openerp.com-20131218151702-68m9z9wm31rj5g2f
 2013-12-18 16:17:02 +01:00
Gery Debongnie 0e8a8517f8 [REF] moves all the charts code from chart.js into the graph widget (in file graph.js) (addon web_graph) 
bzr revid: ged@openerp.com-20131218150756-ol0or9m6pg61ye2c
 2013-12-18 16:07:56 +01:00
ddm 245a6aafa9 [FIX] Fix UI test runner 
bzr revid: ddm@openerp.com-20131218150056-xqueu19zpm17nlpj
 2013-12-18 16:00:56 +01:00
ddm 4f0ad3f64a [IMP] Basic support for ui tests 
bzr revid: ddm@openerp.com-20131218145628-9oqxlwy4g05n4jwa
 2013-12-18 15:56:28 +01:00
Frédéric van der Essen 586e8984fe [FIX] point_of_sale: proper closing action 
bzr revid: fva@openerp.com-20131218145602-0ss9j35xg0bofeh7
 2013-12-18 15:56:02 +01:00
Martin Trigaux fe5383f0e2 [MERGE] [IMP] account_payment: remove widget=selection (was forcing the preloading of every partner for an invisible field) 
bzr revid: mat@openerp.com-20131218144617-pq3oy121rxaxiu5r
 2013-12-18 15:46:17 +01:00
Thibault Delavallée 9315134b7d [IMP] website_sale_delivery: delivery costs also in review + removed the button to update the sale order as it is now directly updated when choosing a carrier 
bzr revid: tde@openerp.com-20131218142759-j4j7jznjyobyrfy6
 2013-12-18 15:27:59 +01:00
Thibault Delavallée 531d40cd3b [IMP] website_sale_delivery: when choosing a carrier, immediately update the sale order 
bzr revid: tde@openerp.com-20131218142735-r444egdcmxfap01v
 2013-12-18 15:27:35 +01:00
Xavier Morel e04983ae69 [IMP] conversion back from m2o t-field to openerp value 
Instead of doing a name_get on the edited value and trying to find out
an m2o to assign back (which there's pretty much no chance of given
there's no autocompletion or anything), alter the m2o record in-place
by setting the provided edited value to its _rec_name.

Ideally, both features could be supported via more advanced m2o
edition widgets which would allow selecting an existing m2o, creating
a new m2o record from scratch or (maybe) editing the existing m2o's
display_name if possible, somewhat similar to what the form view
provides.

Without these though, the only action which makes any sense is to edit
the user-visible "value" where it is found, as with more normal
fields.

bzr revid: xmo@openerp.com-20131218140917-4eo2o55yfcumzhov
 2013-12-18 15:09:17 +01:00
Martin Trigaux 90dfa5895d [FIX] gamification: send badge on user, fix function field 
bzr revid: mat@openerp.com-20131218140333-nipcc21z5snhac1c
 2013-12-18 15:03:33 +01:00
Xavier Morel b741852c3d [IMP] correctly handle writing to a view without a model_data (e.g. test views) 
bzr revid: xmo@openerp.com-20131218134932-382cvndk8asr82ip
 2013-12-18 14:49:32 +01:00
jke-openerp 86b827113b [Typo] print for debug warning 
bzr revid: jke@openerp.com-20131218134334-adel8j7onf0ziuh7
 2013-12-18 14:43:34 +01:00
Gery Debongnie 7bb84af05f [REF] large refactoring of graphview: it separates the drawing code into a widget that can be used independently of the view (addon web_graph) 
bzr revid: ged@openerp.com-20131218134040-63fcm5a68gsk3hry
 2013-12-18 14:40:40 +01:00
jke-openerp 088a2f6447 [Typo] Typo + print for debug warning 
bzr revid: jke@openerp.com-20131218133939-nxiwt25bjevs1kic
 2013-12-18 14:39:39 +01:00
Xavier Morel eb44a6b21e [FIX] in contactus page, replace res_company.partner_id by res_company.name so it can be saved 
bzr revid: xmo@openerp.com-20131218132610-adby5u0daviprjev
 2013-12-18 14:26:10 +01:00
Thibault Delavallée 2578feda85 [MERGE] Sync with website-al 
bzr revid: tde@openerp.com-20131218132218-y5gn6noemlhmtuth
 2013-12-18 14:22:18 +01:00
Thibault Delavallée 7a564f261e [IMP] [FIX] [ADD] website_sale, website_sale_delivery: delivery + ecommerce code cleaning 
- added a website_order_line on sale.order model, that are the lines to display
and use in the front-end. This allows to display only products (and not delivery
costs), and to have a correct badge for the number od products.
- cleaned ecommerce website code and method name. Still some cleaning to do
I think.
- fixed some issues in partner and shipping info management, now using CheckoutInfo
more cleanly
- fixed the process of choosing the carrier

bzr revid: tde@openerp.com-20131218132150-f4br0099p2caf43i
 2013-12-18 14:21:50 +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
jke-openerp e4469e0aeb [MERGE] Merge with trunk 
bzr revid: jke@openerp.com-20131218131034-61e6su19shmrgakz
 2013-12-18 14:10:34 +01:00