pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,746 Commits 1 Branch 0 Tags
f61339b82cd6993f00a91149fb5dca7a2bfb8ab1
Commit Graph
89746 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibault Delavallée 0b28fb706f [MERGE] Sync with trunk 
bzr revid: tde@openerp.com-20140508120955-m29bs4no8uogrm0n
 2014-05-08 14:09:55 +02:00
Quentin (OpenERP) 223096b9ae [FIX] mrp: removing product_qty from stock move creation 
bzr revid: qdp-launchpad@openerp.com-20140508115917-oev3zxahuh16zfk0
 2014-05-08 13:59:17 +02:00
Fabien Meghazi 522dec2fcd [IMP] assets bundle: allow to filter on type of assets 
bzr revid: fme@openerp.com-20140508115157-ngtf46vasmygvt7n
 2014-05-08 13:51:57 +02:00
Gery Debongnie 1c87d5b6f4 [FIX] render the pivot table correctly (addon web_graph) 
The code was bugged: it added a <tbody> tag around each rows instead of adding the rows to a single tbody.

bzr revid: ged@openerp.com-20140508112723-b6ffkmufwux1z0a7
 2014-05-08 13:27:23 +02:00
Gery Debongnie b9c217e850 [FIX] add $ to jquery variables (addon web_graph) 
the rendering code of the pivot table didn't use $ in jquery variables,
this commit fixes that issue and slightly simplify their names.

bzr revid: ged@openerp.com-20140508111311-kargzvzlttutwt47
 2014-05-08 13:13:11 +02:00
Quentin (OpenERP) cf25f17766 [FIX] stock: removing product_qty from stock move creation 
bzr revid: qdp-launchpad@openerp.com-20140508110357-zl3et4ojq5np9bpj
 2014-05-08 13:03:57 +02:00
Gery Debongnie 79c197814b [IMP] improve the way indentation is done in pivot table (addon web_graph) 
Previously, it was done in a ugly way: added several spans with the class
.graph_indent.  Now, it simply sets the margin of the content.

bzr revid: ged@openerp.com-20140508110027-bdjdzlpfptjuf4fa
 2014-05-08 13:00:27 +02:00
Quentin (OpenERP) 4a814282eb [REF] stock: raising an error if we try to set the product_qty field on stock.move instead of the product_uom_qty, to detect programming errors and warn that the semantic of this field changed 
bzr revid: qdp-launchpad@openerp.com-20140508104122-rt8ze9iir8i5q60q
 2014-05-08 12:41:22 +02:00
Quentin (OpenERP) 6362a48e18 [FIX] stock: orderpoint_count doesn't exist anymore 
bzr revid: qdp-launchpad@openerp.com-20140508102957-folu3x9thplgt5ho
 2014-05-08 12:29:57 +02:00
Quentin (OpenERP) f2ff555432 [REF] stock_account: introduced _get_invoice_vals() to ease inheritance of this feature 
bzr revid: qdp-launchpad@openerp.com-20140508102505-f4bwpgixezwhkq6h
 2014-05-08 12:25:05 +02:00
Quentin (OpenERP) a029fb22d0 [FIX] stock: fixed error 'cannot import name html_template' 
bzr revid: qdp-launchpad@openerp.com-20140508100856-jbitae0fzsdt7v78
 2014-05-08 12:08:56 +02:00
Quentin (OpenERP) ce7a7f570a [MeRGE] merged with trunk up to revision 9427. 
bzr revid: qdp-launchpad@openerp.com-20140508100622-v90tn9bhzdgic6cd
 2014-05-08 12:06:22 +02:00
Martin Trigaux 133c5033a0 [MERGE] [FIX] document_page: allow other users than administrator to create menu to a static page 
Due to a global rule on ir.values (which is created when creating a ir.ui.menu), we need to execute the action as super user.

bzr revid: mat@openerp.com-20140508093129-tzkqpizpwr7vv0zu
 2014-05-08 11:31:29 +02:00
Martin Trigaux 7d36f54288 [FIX] account_analytic_analysis: revert method signature change made at rev 9277 
The additional parameters were made to avoid overwriting values when changing of template.
As we can not add parameters in only one module, we overwrite values only for not saved records.
This mitigates the overwrite while not changing the API.

bzr revid: mat@openerp.com-20140508083948-gkk7d1250a8znhlt
 2014-05-08 10:39:48 +02:00
Fabien Meghazi e9572c56b3 [IMP] monodb selects first database if only one match. Even if db-filter was not provided 
bzr revid: fme@openerp.com-20140508083921-pu2zte8fq69wvo8o
 2014-05-08 10:39:21 +02:00
Barad Mahendra 0b9126d0fe [IMP]remove unwanted css 
bzr revid: mba@tinyerp.com-20140508083740-g0u9cfef10d94oxh
 2014-05-08 14:07:40 +05:30
Gery Debongnie 319ed3dede [MERGE] merge trunk-claimcount-fix-ged 
Add the claim_count_out field to its correct place (in addon claim_from_delivery).  The field was removed because it was incorrectly added to stock.py instead of the addon claim_from_delivery.  (note: it was renamed from claim_count to claim_count_out)

bzr revid: ged@openerp.com-20140508083512-jx4mke0r5f8p0lxf
 2014-05-08 10:35:12 +02:00
Gery Debongnie 8e16385aec [IMP] change the method name _claim_count into _claim_count_out 
also, add a comment to explain why it is necessary to add a _claim_count_out method in 
stock_picking_out even though it will not be called.

bzr revid: ged@openerp.com-20140508083149-rdophw2iihzntfpr
 2014-05-08 10:31:49 +02:00
Gery Debongnie 131f91db15 [IMP] change claim_count in claim_count_out (addon claim_from_delivery) 
also, simplify the implementation.  The empty method _claim_count in
stock_picking_out is due to the weird way inheritance works in openerp,
and the fact that stock.picking.out only call the method in its parent

bzr revid: ged@openerp.com-20140508075957-lyqvng5i155b28cy
 2014-05-08 09:59:57 +02:00
Fabien Meghazi cf87afbe0a [FIX] configuration file dbfilter's option has no effect 
lp bug: https://launchpad.net/bugs/940439 fixed

bzr revid: fme@openerp.com-20140508075025-yszqmzie1z4n7l4j
 2014-05-08 09:50:25 +02:00
Gery Debongnie b73e2e95ec [FIX] add missing claim_count field to stock.picking.out 
The claim_count field was incorrectly added into addon stock instead 
of addon claim_from_delivery.  The commit adding the claim_count field
in stock.py was reverted, but claim_count is still needed in 
claim_delivery_view.xml.

bzr revid: ged@openerp.com-20140508072741-sr3a9ishpqtkczlq
 2014-05-08 09:27:41 +02:00
Barad Mahendra c7957d696b [IMP]improve the form view of task issue 
bzr revid: mba@tinyerp.com-20140508064114-9ohw86ymc7h3ox19
 2014-05-08 12:11:14 +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
Barad Mahendra d9f8f11541 [IMP]improve the widget for dropdown selection and priority 
bzr revid: mba@tinyerp.com-20140508055735-ekt5gh7w119w2i2j
 2014-05-08 11:27:35 +05:30
Launchpad Translations on behalf of openerp 80aa26963e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140508053846-issswyvoac14767d
 2014-05-08 05:38:46 +00:00
Jitendra Prajapati (OpenERP) 49a7338b00 [IMP]improve code: call super method instead of manual search 
bzr revid: jpr@tinyerp.com-20140508052730-5oztw3um6h42osvd
 2014-05-08 10:57:30 +05:30
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) a47d8d9640 [REV] partial revert of revision 9408 ged@openerp.com-20140502144544-c5j7bzlm9i4clv4l where we wrongly beleive than stock depends on crm_claim... :( That code will probably be back _in the right module_ 
bzr revid: qdp-launchpad@openerp.com-20140507180851-lgkb8n4pscizbwvw
 2014-05-07 20:08:51 +02:00
Quentin (OpenERP) 5b93981087 [FIX] mrp: wrong field set when copying move 
bzr revid: qdp-launchpad@openerp.com-20140507172446-pywoej0ryovue5y3
 2014-05-07 19:24:46 +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
Quentin (OpenERP) 0d96d46138 [REF] mrp: moving some data updating in .XML file instead of having a new .YML file for it 
bzr revid: qdp-launchpad@openerp.com-20140507171205-eop6g5p59mdig49r
 2014-05-07 19:12:05 +02:00
Fabien Meghazi 95e1bd0612 [REM] completetly removed website#preprocess_request() 
bzr revid: fme@openerp.com-20140507170816-rrnh1nlqf97pfy3k
 2014-05-07 19:08:16 +02:00
Christophe Simonis b8089a1521 [MERGE] forward port of branch saas-4 up to revid 9410 chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1 
bzr revid: chs@openerp.com-20140507170112-bjeltv2b0coy60am
 2014-05-07 19:01:12 +02:00
Olivier Dony 083108a624 [IMP] delivery,stock,mrp: minor cleanup/spellchecking/nit-picking while reviewing 
bzr revid: odo@openerp.com-20140507165951-th4iqsrp6l67dvve
 2014-05-07 18:59:51 +02:00
Fabien Meghazi 7654b7699c [REM] QWeb does not self close empty divs anymore 
See web Rev#4011

bzr revid: fme@openerp.com-20140507165126-e32a6qne8slgin09
 2014-05-07 18:51:26 +02:00
Christophe Simonis 9a271eef16 [FIX] mail: correct code indentation introduced during previous forward-port 
bzr revid: chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
 2014-05-07 18:42:07 +02:00
Fabien Meghazi 8e29e128eb [FIX] Do not self close empty elements that are not html void elements 
bzr revid: fme@openerp.com-20140507162903-1s2rmlvawohlxvc0
 2014-05-07 18:29:03 +02:00
Quentin (OpenERP) 3fcc60c689 [REF] removed duplicated _ before method name 
bzr revid: qdp-launchpad@openerp.com-20140507162054-l31zu5608w7xvfu0
 2014-05-07 18:20:54 +02:00
Christophe Simonis 1091b24a0c [MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br 
bzr revid: chs@openerp.com-20140507160023-8wwqlbf3bv7yqe67
 2014-05-07 18:00:23 +02:00
Kersten Jeremy 13d18d2bdb [FIX] Graph - Add context in fields_get to have the right translation in col_header and other places where terms was not translate. 
lp bug: https://launchpad.net/bugs/1317079 fixed

bzr revid: jke@openerp.com-20140507154758-0vkq9rywjyl55f5w
 2014-05-07 17:47:58 +02:00
Christophe Simonis 1953aa442f [MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi 
bzr revid: chs@openerp.com-20140507153348-g2qw61dkxvps13br
 2014-05-07 17:33:48 +02:00
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 9086f5b613 Large cleanups in addons 
The code I merged in my branch stat buttons was sadly not up to our 
standing...  This branch improves the situation by removing harmful
try/excpet/pass statements, by using search_count when appropriate, by
removing unused one2many fields and by correcting some bugs

bzr revid: ged@openerp.com-20140507151749-k37iclwt499ip3e4
 2014-05-07 17:17:49 +02:00
Gery Debongnie 59f8fe0267 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140507151631-qvkun5z9wvew6069
 2014-05-07 17:16: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 ad0ed2c4d8 [FIX] code cleanup (addon hr_timesheet_sheet) 
remove try/except/statement that should not be here, uses search_count when appropriate, and remove a now useless one2many field

bzr revid: ged@openerp.com-20140507141725-h2z9u72roscf407n
 2014-05-07 16:17:25 +02:00
Gery Debongnie 188241ce00 [FIX] code cleanup (addon hr_contract) 
simplify the method _contracts_count, remove try/except/pass statements

bzr revid: ged@openerp.com-20140507140718-waw1di92qicsch2z
 2014-05-07 16:07:18 +02:00
Gery Debongnie 104110de33 [FIX] code cleanup (addon hr_payroll) 
remove try/except/pass in _count_detail_payslip and in _payslip_count, improves these methods and remove the now useless field payslip_ids

bzr revid: ged@openerp.com-20140507135826-xlo5gn7iq612lonp
 2014-05-07 15:58:26 +02:00
Gery Debongnie 3be9d940f7 [FIX] code cleanup (addon account_asset) 
simplify the method _entry_count by using search_count and by removing try/except/pass

bzr revid: ged@openerp.com-20140507134544-oi3y8hwf16nituki
 2014-05-07 15:45:44 +02:00
Gery Debongnie c13b9a1262 [FIX] code cleanup (addon procurement) 
improves the _orderpoint_count method.  Also, as a bonus, the preexisting orderpoint_ids is not used
in any other place, so it can be removed as well

bzr revid: ged@openerp.com-20140507134134-isaor8ulq4pf5wrt
 2014-05-07 15:41:34 +02:00