pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,218 Commits 1 Branch 0 Tags
bed6b01c53b520591e6f693dbb5c25cc5b772bbc
Commit Graph
91218 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Morel bed6b01c53 [ADD] qweb-js: escf, rawf for parity with Python version 2014-10-06 19:13:42 +02:00
Xavier Morel 4fb49a67f3 [ADD] qweb-js: jinja-style interpolation pattern 2014-10-06 19:13:41 +02:00
Xavier Morel 35f5fb46e7 [IMP] qweb-js: reimplement string interpolation compilation as a single pass 2014-10-06 19:13:40 +02:00
Xavier Morel 9fe71a5d18 [IMP] update qweb-js tests 
* latest qunit
* template loading (handle async)
* add format tests
 2014-10-06 19:13:40 +02:00
Martin Trigaux 8843974d04 Forward port of branch saas-3 up to fc9fc3e 2014-10-06 15:52:23 +02:00
Simon Lejeune e388cb8c32 [FIX] account: res_config: gain/loss exch. account onchange 
Commit f4e350ca3 defined an `onchange_company_id` method, never executed
because another `onchange_company_id` was defined below. Merged the first
in the second.
 2014-10-06 15:27:53 +02:00
Simon Lejeune 1029dbc4f3 [FIX] website_quote: forbid to define a quote template on a sale order 
Defining a quote template may change the product list. The field template_id is now editable
only when the sale.order is in draft or sent state.
 2014-10-06 15:13:30 +02:00
Jeremy Kersten 651d5748e3 [IMP] website_crm: allow the response from crm thanks page to be overridable 2014-10-06 14:34:29 +02:00
Jeremy Kersten c04b0443b7 [FIX] google_calendar: add missing parameter to logger_info 2014-10-06 14:32:28 +02:00
Martin Zlámal fc9fc3e0b8 [FIX] common.py: missing import 
It was not possible to call "about" function via remote control
(XML-RPC), because it contains string translation without import.
 2014-10-06 12:28:45 +02:00
Raphael Collet afb91fde81 [FIX] models: fields_get() shall not return info about fields not set up yet 
When processing data files during a module installation/upgrade, not all fields
are set up yet, in particular relational custom fields.  Make fields_get()
ignore those fields, so that views can be created/updated and validated,
provided they do not refer to those fields...
 2014-10-06 11:56:03 +02:00
Young Joy dfc2e1ce1b [FIX] project: typo in protect.task create 
that typo will cause project task create error when set date_end before the time right now
 2014-10-06 11:39:27 +02:00
Josse Colpaert f563be5cc0 Merge pull request #2918 from odoo-dev/8.0-wmsextramoves-jco 
[IMP] Make sure invoice_state of picking is used when creating extra moves
 2014-10-06 09:52:12 +02:00
Josse Colpaert f3bb39dc45 Merge pull request #2827 from odoo-dev/8.0-eanproductviews-2772-jco 
8.0 eanproductviews 2772 jco
 2014-10-06 09:50:01 +02:00
Josse Colpaert fc65efbb9b [FIX] Fix inheritance in point_of_sale views + ean visible on creation + landed costs views 
[IMP] Set custom EAN not visible when multiple variants

[IMP] Change landed costs views + make ean visible upon creation
 2014-10-06 09:14:20 +02:00
Josse Colpaert 899f2066e9 [FIX] Adapt product variants in order to show internal code and ean13 #2772 
[IMP] Typo
 2014-10-06 09:14:20 +02:00
Josse Colpaert 383f2b2c43 [IMP] Make sure invoice_state of picking is used when creating extra moves and take price of related move if there is one 
When we would copy, it gives problems as it won't be invoiced the correct way on sale, so we provide for a simpler solution.
 2014-10-06 09:10:09 +02:00
Jeremy Kersten ab7b5d7732 [FIX] website_crm: move the input hidden generated with kwargs at bottom of the form. Else, if the args is a field displayed later, form never look about the new value and error remains. When we post a form with 2 fields with the same name, we got only the first one into kwargs from controller. 2014-10-03 22:26:26 +02:00
Jeremy Kersten 24bec094c2 [IMP] hr_holiday/calendar : allow to pass no_email into context when we create a meeting to avoid to send a mail to attendees. 2014-10-03 20:43:48 +02:00
Jeremy Kersten 42c13efcee [IMP] google_calendar: add missing file google_calendar.xml 2014-10-03 18:08:28 +02:00
Jeremy Kersten f3346223ac [IMP] Google calendar - add function to allow the cron to run google calendar synchronization 2014-10-03 17:52:31 +02:00
Prashant Panchal ecacffcb6e [FIX] account_anglo_saxon: avoid two box purchase_ok field 
as account_anglo_saxon depends from purchase and purchase already adds the field purchase_ok
Fixes #2630
 2014-10-03 17:26:28 +02:00
Holger Brunn 4c6a998c29 [FIX] auth_ldap: remove insignificant spaces in login 
strip spaces from user name as they will probably be ignored by ldap's search (rfc4518)
Fixes #2865
 2014-10-03 17:02:12 +02:00
Arthur Maniet e6ca891714 Merge pull request #2894 from erwin-bas-solutions/translation-reconcile 
[FIX] Account. Missing translation on write-off comment
 2014-10-03 16:00:10 +02:00
Erwin van der Ploeg 2ec99aee18 [FIX] Account. Missing translation on write-off comment 2014-10-03 15:38:45 +02:00
Martin Trigaux 7e33a4746b Forward port of branch 7.0 up to b3485fb 2014-10-03 15:17:36 +02:00
Martin Trigaux b3485fb59c [FIX] event: double context 2014-10-03 15:15:12 +02:00
Martin Trigaux e11d44eab4 [FIX] event: missing context 
This fixes some translation issues (templates not translated at event confirmation)
 2014-10-03 15:12:04 +02:00
Julien Legros 5153b2d281 [FIX] website_quote: use dedicated email template if a quote template exists 2014-10-03 14:22:38 +02:00
Denis Ledoux 7aa5d397c8 [Revert] cb30783aba & 6349048ba0 
[FIX] web: avoid force_reload in list editable
[FIX] web: force load record after reload page

These fixes prevent to open existing record form
 2014-10-03 14:03:12 +02:00
Martin Trigaux 066fbb6613 [FIX] account_anglo_saxon: price difference, discount and taxes 
When computing the price difference amount do not integrate the eventual discount and taxes included in the price.
Otherwise the total of the generated accounting enty would be higher than the total of the invoice. opw 611350
 2014-10-03 12:19:01 +02:00
Denis Ledoux cd6dba5257 [MERGE] forward port of branch 7.0 up to 9066da3 2014-10-03 12:13:07 +02:00
Denis Ledoux 9066da3369 [FIX] point_of_sale: do not display False as currency if symbol is not set 2014-10-03 12:10:16 +02:00
Denis Ledoux 7cbd524448 [FIX] ir_translation: apply tools.ustr on the trad itself 
tools.ustr(None) returns u'None', res[0] can be None.
 2014-10-03 12:08:49 +02:00
Martin Trigaux cb30783aba [FIX] web: avoid force_reload in list editable 
When creating a new record in list editable, due to previous commit 6349048, the load_record was called twice and the first record of the current list view (self.dataset.index) was used to fill the new record.
With this, we make sure a new record is indeed created.
Fix the web test to have a default_get call in mock models and increase the number of default_get assertions (for creations in list editable, the default_get is then called twice, not optimal but due to the absence of distinction between empty datarecord and filled with default values).
 2014-10-03 11:41:00 +02:00
Denis Ledoux 76fdbec3bb [MERGE] forward port of branch 7.0 up to 6d4e1cc 2014-10-03 11:22:47 +02:00
Denis Ledoux 6d4e1cc73e [FIX] ir_translation: remove control characters from translations 
This is possible that control characters (such as line returns) are inserted wrongly in translations
These should not influence on the web interface
 2014-10-03 11:20:19 +02:00
dhr-odoo b2cb31c0fb [FIX] account: return format of function field 
When no result is found on the function field 'invoice' (account.move.line), instead of returning {move_id: (False, '')}, return {move_id: False} (expected for m2o fields)
Fixes #2138, opw 613096
 2014-10-03 09:59:38 +02:00
Martin Trigaux 6349048ba0 [FIX] web: force load record after reload page 
When reloading a page, the _actualize_mode is called before the record is loaded and the form is displayed partially in edit mode (o2m fields with delete/add icons).
This patch forces to trigger a load_record when the datarecord has not been loaded yet in the do_show merthod (opw 607910)
 2014-10-03 09:29:22 +02:00
Denis Ledoux 6d509c0c6b [REF] website*: set spinner style in class, instead of inline 
This fix is related to:
8298cf6510
51e399d9ac
9056c58cb8
 2014-10-02 20:33:53 +02:00
Wolfgang Taferner 51e399d9ac [FIX] website_sale: shopping cart quantity width (qty > 9) 2014-10-02 18:45:14 +02:00
Wolfgang Taferner 9056c58cb8 [FIX] website_sale: too tiny quantity input (if qty > 9) for all occurences 2014-10-02 18:28:33 +02:00
Denis Ledoux 1c6c289f7b [FIX] api: clear environments on module installation 2014-10-02 17:46:25 +02:00
Denis Ledoux e4eff4ba66 [FIX] mail: keep breadcrumb on click on chatter follower 2014-10-02 17:35:27 +02:00
Simon Lejeune 9bf8dea569 [FIX] email_template: don't escape the signature, it's a field html 
Fields of html type are already escaped in database and the method
`append_content_to_html` defaults the argument `plaintext` to True,
then calls `plaintext2html` if this argument is True, resulting in
the html signature being escaped twice.
 2014-10-02 17:05:35 +02:00
Denis Ledoux 40c8dd9a28 [FIX] ir_qweb: search assets as superuser 
A security has been introduce in eb9113c04d to restrict access to orphan attachments to employees only

Assets need to be build and accessed as superuser, thus
 2014-10-02 16:36:17 +02:00
jmustonen 5544cf0036 [FIX] odoo.py windows compatibility 
Prevent infinite loop when installing on windows
Fixes #2825

Tested to work on
* Git Bash v1.9.4 on Windows 8.1 Professional
* Ubuntu 12.04.5 LTS
 2014-10-02 16:12:19 +02:00
Simon Lejeune 6e8b678667 [FIX] web: manual update of select2 lib to 3.5.1 version 
The previous version of the lib seemed to be in an inconsistent state.
This fix the select2-offscreen class when the page is larger than
10 000px (this situation happens when importing a file with lots
of column).
 2014-10-02 15:41:55 +02:00
Denis Ledoux 14f3085776 [MERGE] forward port of branch saas-3 up to 77500e5 2014-10-02 15:36:58 +02:00
Denis Ledoux 77500e54ec [MERGE] forward port of branch 7.0 up to eb9113c 2014-10-02 15:34:02 +02:00