odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
82,020 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

193 Commits

Author SHA1 Message Date
DBR (OpenERP) 9b0e56124f [IMP]account_analytic_analysis: Improve code for create contract from contract template 
bzr revid: dbr@tinyerp.com-20130228092036-tfne364mns9v6238
 2013-02-28 14:50:36 +05:30
DBR (OpenERP) b267a9e1c1 [IMP]Improve cron job 
bzr revid: dbr@tinyerp.com-20130227115207-k2jnzds2tow7togh
 2013-02-27 17:22:07 +05:30
DBR (OpenERP) 2d18a009f1 [IMP]Remove extra button and set grey color for a para. 
bzr revid: dbr@tinyerp.com-20130227100115-panqiupw1j2yzvdy
 2013-02-27 15:31:15 +05:30
DBR (OpenERP) 08c7ed3af3 [IMP]improve warning msg 
bzr revid: dbr@tinyerp.com-20130226112954-5f0fgky9zagfntsj
 2013-02-26 16:59:54 +05:30
DBR (OpenERP) 49061b5f30 [IMP]improve warning msg 
bzr revid: dbr@tinyerp.com-20130226112426-dthza6gha0klsqqo
 2013-02-26 16:54:26 +05:30
DBR (OpenERP) d9d7c96218 [IMP]Improve code and remove extra views 
bzr revid: dbr@tinyerp.com-20130226095232-yxjjlsqzj9bvdbg3
 2013-02-26 15:22:32 +05:30
DBR (OpenERP) 5576777efa [IMP]account_analytic_analysis: Improve warning msg 
bzr revid: dbr@tinyerp.com-20130426070430-g6byo2613tup1qf6
 2013-04-26 12:34:30 +05:30
DBR (OpenERP) 0d7f5a98a1 [IMP]account_analytic_analysis: Improve cron method 
bzr revid: dbr@tinyerp.com-20130426064604-0n3dgcrxipjrz0jv
 2013-04-26 12:16:04 +05:30
DBR (OpenERP) caf9999e37 [IMP]account_analytic_analysis: Improve on_change of product 
bzr revid: dbr@tinyerp.com-20130226053542-g7yw7exjycvxxwni
 2013-02-26 11:05:42 +05:30
DBR (OpenERP) 7c7bee5d39 [IMP]account_analytic_analysis: Improve code for normal orm 
Remove posgress view

bzr revid: dbr@tinyerp.com-20130225133511-j43f4z5jl5hb8e2h
 2013-02-25 19:05:11 +05:30
DBR (OpenERP) 9d630ceda7 [IMP]account_analytic_account: Improve cron function temp via button and split query 
bzr revid: dbr@tinyerp.com-20130222131401-ou4dktk5kiojnsw1
 2013-02-22 18:44:01 +05:30
DBR (OpenERP) 1ac3f5df62 [IMP]account_analytic_analysis: 
Improve code for tax calculation

bzr revid: dbr@tinyerp.com-20130222105927-4x4yhy5gs2k0edhk
 2013-02-22 16:29:27 +05:30
DBR (OpenERP) 92fc06063c [Merge] lp:openobject-addons 
bzr revid: dbr@tinyerp.com-20130222055629-7b4wjhef7l66l6ri
 2013-02-22 11:26:29 +05:30
DBR (OpenERP) d4f73eb924 [IMP]account_analytic_analysis: 
Improve the posgress view as per specification
Improve code for subtotal and line taxes

bzr revid: dbr@tinyerp.com-20130221134355-9lqe412182voa8b0
 2013-02-21 19:13:55 +05:30
DBR (OpenERP) a9551459cd [IMP]account_analytic_analysis : Create new posgress view for o2m virtual invoice field 
bzr revid: dbr@tinyerp.com-20130220132838-ddh64pa31wabtx61
 2013-02-20 18:58:38 +05:30
al@openerp.com a899c8087b [FIX] account_analytic_analysis contract remind send a link 
bzr revid: al@openerp.com-20130218174548-ct6wwed6plcvdilo
 2013-02-18 18:45:48 +01:00
Antony Lesuisse e6d719cf3a [FIX] account_analytic_analysis only remind contracts 
bzr revid: al@openerp.com-20130218161222-f7jmrek9udvwapml
 2013-02-18 17:12:22 +01:00
DBR (OpenERP) 6d19450457 [IMP]account_analytic_analysis: 
Add Recurrent virtual invoice functionality 
Try to set cron job but and test it's function with temp invoice btn

bzr revid: dbr@tinyerp.com-20130218125117-4sqbhxb1vro2nzhp
 2013-02-18 18:21:17 +05:30
Antony Lesuisse b1eba6c1ef Fix contract expiration reminder: 
- fix domains and check for 3 different type of expiration
- use an email template instead of an hardcoded string

bzr revid: al@openerp.com-20130214235330-bmgjq962vn76q39x
 2013-02-15 00:53:30 +01:00
Olivier Dony 49597f0e66 [MERGE] *: improved english wording, suggestions courtesy of OpenERP Community 
bzr revid: odo@openerp.com-20121221164808-kdjrtcbgma4dr3on
 2012-12-21 17:48:08 +01:00
Vo Minh Thu e7f4891d46 [IMP] use the openerp namespace. 
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
 2012-12-06 15:56:32 +01:00
Quentin (OpenERP) 6f256d41db [FIX] account_analytic_contract, analytic_contract_hr_expense, hr_timesheet_invoice: fixed the computation of *to_invoice fields 
bzr revid: qdp-launchpad@openerp.com-20121127120737-5xeed6lobynqf10l
 2012-11-27 13:07:37 +01:00
Nimesh (Open ERP) 8a59fa0199 [IMP] correct the total for contract and fix problem of number of qty in for the same product. 
bzr revid: nco@tinyerp.com-20121120115127-4zb0hpcqpzvqffc2
 2012-11-20 17:21:27 +05:30
Nimesh (Open ERP) 65cd11f10d [FIX] fix the worng invoice amount. 
bzr revid: nco@tinyerp.com-20121116132055-sfyjk47onvxl8wle
 2012-11-16 18:50:55 +05:30
Fabien Pinckaers eff45f038d [IMP] invoice on timesheet using user price 
bzr revid: fp@openerp.com-20121028121730-1sbhsoyxa220oktn
 2012-10-28 13:17:30 +01:00
Jiten (OpenERP) 186681dad5 [IMP] Improved code in account_analytic_analysis py file to remove warning on server log. 
bzr revid: jra@tinyerp.com-20120831102457-fmnon768mj73vyl0
 2012-08-31 15:54:57 +05:30
Fabien Pinckaers 254489e168 [IMP] analytic contracts 
bzr revid: fp@tinyerp.com-20120829190831-f6n1ruzsca2bo8xc
 2012-08-29 21:08:31 +02:00
Bhumi Thakkar (Open ERP) 85eee1fad0 [FIX] Replace '=' with 'in'. 
bzr revid: bth@tinyerp.com-20120827091656-emz7wpwsyyto3n12
 2012-08-27 14:46:56 +05:30
Quentin (OpenERP) f699262170 [MERGE] perf improvements of analytic account analysis. Courtesy of Ronald Portier (Therp) 
bzr revid: qdp-launchpad@openerp.com-20120726101423-3b4wfq0xuv02kuqf
 2012-07-26 12:14:23 +02:00
Divyesh Makwana (Open ERP) b8221e8f7d [Merge] Merge with main addons. 
bzr revid: mdi@tinyerp.com-20120726042316-1lricsztfdwmx500
 2012-07-26 09:53:16 +05:30
Divyesh Makwana (Open ERP) 69d9a3d4e2 [IMP] analytic, account_analytic_account : The field 'template_id' need to moved from 'account_analytic_analysis' module to 'analytic' so we can override 'on_change_template' from respective module(project, project_issue and hr_timesheet). 
bzr revid: mdi@tinyerp.com-20120723120531-38reqpofvzh69bo7
 2012-07-23 17:35:31 +05:30
Rajesh Prajapati (OpenERP) 71122ae47a [IMP]tooltip : I have changed the tooltip of fields as suggested 
bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5
 2012-07-13 15:47:51 +05:30
Sanjay Gohel (Open ERP) fe938a4558 [IMP]add tooltip on type and add date,date_Start in on change template 
bzr revid: sgo@tinyerp.com-20120626094843-ubz386g7f42jc2d2
 2012-06-26 15:18:43 +05:30
Ronald Portier 2c115e6856 [FIX] Problem with runaway cpu and/or postgres crash on analytic account analysis. 
lp bug: https://launchpad.net/bugs/1015995 fixed

bzr revid: ronald@therp.nl-20120622141932-f6rywvd1nawn186w
 2012-06-22 16:19:32 +02:00
Sanjay Gohel (Open ERP) 95cd61d1f5 [IMP]improve view of contract and open chatter notification added when state changed 
bzr revid: sgo@tinyerp.com-20120622091008-uy805uph0hz4vk0h
 2012-06-22 14:40:08 +05:30
Quentin (OpenERP) 015f03776e [IMP] contract management: improved usability, mostly in account.analytic.account form view 
bzr revid: qdp-launchpad@openerp.com-20120619122128-axj9zn61ahalgg98
 2012-06-19 14:21:28 +02:00
Quentin (OpenERP) b9744fc4d9 [FIX] contract management: shortcut buttons on contract form view 
bzr revid: qdp-launchpad@openerp.com-20120618155447-26rt90uvml410rwu
 2012-06-18 17:54:47 +02:00
Quentin (OpenERP) 0182e3b17b [FIX] analytic_contract_hr_expense: fixed amounts in billing table + view inheritancy 
bzr revid: qdp-launchpad@openerp.com-20120618145720-s1bcig0x52vj1t2w
 2012-06-18 16:57:20 +02:00
Quentin (OpenERP) 7d7ba1515b [FIX] account_analytic_analysis: fixed amounts in billing table + [FIX] hr_timesheet_invoice: fixed filter 'to_invoice' 
bzr revid: qdp-launchpad@openerp.com-20120618131022-a0sacqmlftg5wm22
 2012-06-18 15:10:22 +02:00
Amit Patel (OpenERP) b9cbfb9a98 [IMP]:improved sale to invoice 
bzr revid: apa@tinyerp.com-20120615133639-aarxp5rn5ovirjug
 2012-06-15 19:06:39 +05:30
Quentin (OpenERP) 33f33dc9ad [FIX] account_analytic_account: onchange_template() fixed 
bzr revid: qdp-launchpad@openerp.com-20120614142247-zhv1qoo6mw9bgcgi
 2012-06-14 16:22:47 +02:00
Quentin (OpenERP) 80be8440fa [IMP] account_analytic_analysis, analytic_contract_hr_expense: remaining to invoice is max(old_remaining, current not invoice) 
bzr revid: qdp-launchpad@openerp.com-20120614133728-7qbwcpdr811oaj7q
 2012-06-14 15:37:28 +02:00
Quentin (OpenERP) 0fd300caf4 [IMP] account_analytic_analysis: the 'remaining hours to invoice' is different than the 'remaining hours to work' 
bzr revid: qdp-launchpad@openerp.com-20120613090525-o5r4b84dfz5r2h6e
 2012-06-13 11:05:25 +02:00
Amit Patel (OpenERP) 6cb8615965 [IMP]:improved code 
bzr revid: apa@tinyerp.com-20120608072512-0r1at3uxjetwecga
 2012-06-08 12:55:12 +05:30
Amit Patel (OpenERP) 38a2bd8cc1 [IMP]:improved report and fixed total_est 
bzr revid: apa@tinyerp.com-20120608064819-p4yy10y6s5n0jtqo
 2012-06-08 12:18:19 +05:30
Quentin (OpenERP) 32ea43d5d2 [IMP] analytic_contract_hr_expense: replay of previous commit (removed during merge for an easy solving) 
bzr revid: qdp-launchpad@openerp.com-20120607124520-s8irgxvg4s2qni03
 2012-06-07 14:45:20 +02:00
Quentin (OpenERP) c23de40df6 [ADD] analytic_contract_hr_expense: split of features of account_analytic_analysis and creation of a new module to contain all the stuff related to hr_expense (in order to keep clean dependancies) 
bzr revid: qdp-launchpad@openerp.com-20120607123641-kjzynx1wwi4282lu
 2012-06-07 14:36:41 +02:00
Amit Patel (OpenERP) e29261ec3b [MERGE/IMP]:lp:~openerp-dev/openobject-addons/trunk-contract-apa-improvements-dbr 
bzr revid: apa@tinyerp.com-20120607114402-dzv6t6q8nn2muyv1
 2012-06-07 17:14:02 +05:30
DBR (OpenERP) 6885badab4 [IMP]analytic: all invoicing data is getting filled from template. 
bzr revid: dbr@tinyerp.com-20120607092218-yt3xyy3gel66z4sj
 2012-06-07 14:52:18 +05:30
DBR (OpenERP) 2c3e08224e [IMP]account_analytic_analysis: Set Template of Contract instead of Template Of Contract 
bzr revid: dbr@tinyerp.com-20120607054818-6v2ci3izb0wpi8y8
 2012-06-07 11:18:18 +05:30
Sanjay Gohel (Open ERP) 26a574f796 [IMP]change report and made changes in timesheet which is not shown contract record and attrs on the field 
bzr revid: sgo@tinyerp.com-20120604071856-xibj1lz9rjclyzmq
 2012-06-04 12:48:56 +05:30
Amit Patel (OpenERP) 8921d70675 [IMP]:improved code 
bzr revid: apa@tinyerp.com-20120601104343-nf2yy1ke9is2wkzn
 2012-06-01 16:13:43 +05:30
Sanjay Gohel (Open ERP) 2da36cab75 [IMP]create function for open hr_expense for current analytic_id in hr_expense line and improve code 
bzr revid: sgo@tinyerp.com-20120531072758-fhaake1kjj13iiwi
 2012-05-31 12:57:58 +05:30
Sanjay Gohel (Open ERP) 11bf57f1bf [IMP]add expense line and add depend expense of hr in contract for calculation 
bzr revid: sgo@tinyerp.com-20120530125641-w27mjp97b981yrpd
 2012-05-30 18:26:41 +05:30
Sanjay Gohel (Open ERP) e886a135ed [IMP/MERGE]improve code and merge with latest parent branch 
bzr revid: sgo@tinyerp.com-20120529104150-a7q7s1v48949cupe
bzr revid: sgo@tinyerp.com-20120529112009-lh2kom166hwkl12w
 2012-05-29 16:50:09 +05:30
Amit Patel (OpenERP) cbb75342c0 [IMP]:improved view and code. 
bzr revid: apa@tinyerp.com-20120529104451-24axuiq8m5s43tcj
 2012-05-29 16:14:51 +05:30
Sanjay Gohel (Open ERP) 3bdb46d113 [IMP]remaining added and view improvement 
bzr revid: sgo@tinyerp.com-20120529103949-wm8ln19qzwjar9yn
 2012-05-29 16:09:49 +05:30
Sanjay Gohel (Open ERP) d29971eb7e [IMP]create view for contract lines and add field which needed 
bzr revid: sgo@tinyerp.com-20120529065713-bokhp0ng21muadvo
 2012-05-29 12:27:13 +05:30
Sanjay Gohel (Open ERP) 22dce01949 [IMP]add sequence file and sequence for analytic account and changes in form view extend type field and made changes in project of account for view an hr_timsheet_invoice and made on change for partner and template ids 
bzr revid: sgo@tinyerp.com-20120528091910-jw8804dxj4hlbjaa
 2012-05-28 14:49:10 +05:30
Quentin (OpenERP) 217c180fa2 [FIX+REF] account_analytic_analysis: fixed the dependancies and a bug related to wrong computation of is_overdue_quantity that was also counting the sales/purchases made instead of only considering the timesheet entries. Refactoring: 200 lines removed, as they were useless since commit 6305 (removal of consolidation on all fields), and as they were filthy and error prone since they were written -_- 
bzr revid: qdp-launchpad@openerp.com-20120120110650-zho7p4mem5vqebse
 2012-01-20 12:06:50 +01:00
Quentin (OpenERP) 6a00d79cd5 [IMP] account_analytic_analysis: removed consolidation of fields because it is complex computation really resource-greedy 
bzr revid: qdp-launchpad@openerp.com-20120109174836-v247yql76ahe7cru
 2012-01-09 18:48:36 +01:00
Fabien Pinckaers 63ad3f6af7 [IMP] Contracts management 
bzr revid: fp@tinyerp.com-20111208152658-9ahc2i138gztg7y1
 2011-12-08 16:26:58 +01:00
Fabien Pinckaers 9073a54e41 [IMP] to fix 
bzr revid: fp@tinyerp.com-20111201134831-w2t5psf00vrwnqwi
 2011-12-01 14:48:31 +01:00
Fabien Pinckaers 36acb24ce4 [IMP] Contract management + fixes 
bzr revid: fp@tinyerp.com-20111116145958-pzp36c49wh6028p9
 2011-11-16 15:59:58 +01:00
Xavier Morel 1a603bd2bd [FIX] account_analytic_analysis: don't return floats or empty strings for date fields (from function fields) when intending False 
bzr revid: xmo@openerp.com-20111116101359-z48vvxxpmkrynxyt
 2011-11-16 11:13:59 +01:00
Fabien Pinckaers 3d9b149dcc [imp] merge + cleaning: contract managemeent, not perfect yet, but good enough -> to replace static email one day 
bzr revid: fp@tinyerp.com-20111108225337-5muyehnvgqasv44i
 2011-11-08 23:53:37 +01:00
Olivier Dony 06fb14130a [IMP] removed method=True params from all fields.function 
Server revision 3495 odo@openerp.com-20110701232328-flgxulxva70vnyxr
removed the need for passing method=True to function fields,
so this is the equivalent addons fix, removing it everywhere.
Please be careful from now on, and do not pass it anymore!

bzr revid: odo@openerp.com-20110701234124-a61zl0idvdfz3hyb
 2011-07-02 01:41:24 +02:00
Stephane Wirtel b8519868a8 [FIX] account_analytic_analysis: Change the query for the order quantity 
bzr revid: stephane@openerp.com-20110426142951-fjvvuqbigpkkxbhd
 2011-04-26 16:29:51 +02:00
Stephane Wirtel b03e5f9034 [IMP] Add a cron for the analytic accounts, this cron will send an email to the responsible of the pending accounts 
bzr revid: stephane@openerp.com-20110422085446-r744ot300i6qwksv
 2011-04-22 10:54:46 +02:00
Mustufa Rangwala 5e988a7057 [FIX] account_analytic_analysis: last_invoice_date field does not include manual invoices => changed the help string 
lp bug: https://launchpad.net/bugs/711737 fixed

bzr revid: mra@mra-laptop-20110203052827-pcd1qdpdwoipuiep
 2011-02-03 10:58:27 +05:30
psi (Open ERP) de9b76381c [FIX] account_analytic_analysis: Installing account_analytic_analysis you have a maximu of 2147 analytic accounts 
lp bug: https://launchpad.net/bugs/699809 fixed

bzr revid: psi@tinyerp.co.in-20110117085902-olq2k7950948uetd
 2011-01-17 14:29:02 +05:30
P. Christeas 0ca6e99f67 analytic_analysis: Fix typo of "Theorical" -> Theoretical 
bzr revid: p_christ@hol.gr-20101227084813-usth1z7afmddmdbe
 2010-12-27 10:48:13 +02:00
olt@tinyerp.com 7efb90b28e [FIX] account_analytic_analysis: res dict should also contains the parent_ids 
bzr revid: olt@tinyerp.com-20101223135439-18l5dvt091uumw0j
 2010-12-23 14:54:39 +01:00
uco (OpenERP) d827b2f6ea [REF]: Added remaining context changes in _constraints. Removed unnecessary checking for context from methods. 
bzr revid: uco@tinyerp.com-20101213064309-vg36f1510xv2f8zb
 2010-12-13 12:13:09 +05:30
uco (OpenERP) 6dd290e824 [REF]: Replace the condition 'if not context' with 'if context is None'. 
bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn
 2010-11-23 12:35:05 +05:30
uco (OpenERP) 12fcd1be2f [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None. 
bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2
 2010-11-19 19:18:01 +05:30
psi (Open ERP) 3fcb1cf996 [REF] account, account_analytic_analysis, account_voucher, membership, pos : Remove warnings Builtbot 
bzr revid: psi@tinyerp.co.in-20101027111108-jdby0r68w6qtfidf
 2010-10-27 16:41:08 +05:30
Mustufa Rangwala 4b09311a73 [FIX] account anlalytic plan: correct _ca_invoiced_calc, _total_cost_calc for total costs and total inoviced (now it will work with amount instead on amount currency) 
bzr revid: mra@mra-laptop-20101026091128-v17ftfamhi3exc6b
 2010-10-26 14:41:28 +05:30
vth 765584ec93 [REf] account_* clean 
give rights to the Marketing user to read the event.registration.badge object

bzr revid: vth@tinyerp.com-20101013134645-tqxcms2ageteg1ik
 2010-10-13 19:16:45 +05:30
psi (Open ERP) faf70e7b3a [IMP] account_analytic_analysis, account_analytic_default, account_analytic_plans: code cleaning 
bzr revid: psi@tinyerp.co.in-20101011112550-ygkqmzmuhu1j7dm3
 2010-10-11 16:55:50 +05:30
vth fa8bd9305d [REF] account 
bzr revid: vth@tinyerp.com-20101011102300-59rukbdh3ps9m2dm
 2010-10-11 15:53:00 +05:30
olt@tinyerp.com e7dba66691 [IMP] account_analytic_analysis, analytic, hr_timesheet_invoice: some fields now uses decimal.precision 
bzr revid: olt@tinyerp.com-20101004131019-0s1paonl2gbunsff
 2010-10-04 15:10:19 +02:00
olt@tinyerp.com f4fdbd27e4 [FIX] account_analytic_analysis: '_analysis_all' function: some ids were missing in the 'result' dict 
bzr revid: olt@tinyerp.com-20101004090631-e61vtc4vh3r5gh47
 2010-10-04 11:06:31 +02:00
Panos Christeas b9c2e86993 [FIX] account_analytic_analysis: added patch from Panos Christeas fixing a bug in _analysis_all and removing the use of 'sum' as a variable 
bzr revid: olt@tinyerp.com-20100927062836-fuojzdp1jk31bdey
 2010-09-27 08:28:36 +02:00
olt@tinyerp.com b1e8536b11 [IMP] account_analytic_analysis: performance improvement: reduced the number of call to sql queries 
bzr revid: olt@tinyerp.com-20100923141455-mpa2kjzsrxk4ni1k
 2010-09-23 16:14:55 +02:00
uco (Open ERP) 31d249a9ab [MERGE] 
bzr revid: uco@tinyerp.com-20100819125727-iuofahcl931exx1r
 2010-08-19 18:27:27 +05:30
RHA (Open ERP) d5ad0b8ff1 [CLEAN]: Removed commented codes, unnecessary spaces. 
bzr revid: uco@tinyerp.com-20100819115157-sfsmbnjdgpp4wl12
 2010-08-19 17:21:57 +05:30
Mustufa Rangwala c5d41a033c [FIX] account_analytic_analysis: Problem in domain get method on rule on report 
bzr revid: mra@mra-laptop-20100819102639-enqr0o9r7h9yrpby
 2010-08-19 15:56:39 +05:30
pap (openerp) fffc508eb9 [IMP]:code cleaning 
bzr revid: pap@tinyerp.co.in-20100706145803-tf7v1pukh03sdals
 2010-07-06 20:28:03 +05:30
pap (openerp) d675363930 [IMP]: clean code in account_analytic_analysis, account_analytic_default and account_analytic_plans 
bzr revid: pap@tinyerp.co.in-20100702140905-uud0pzhb88jmb48n
 2010-07-02 19:39:05 +05:30
vra bf8d2a73c0 [IMP][REF] Sql-injection changes, remove print statement, some space improvement. 
bzr revid: vra@tinyerp.com-20100616115139-cql5oiqf622spa6p
 2010-06-16 17:21:39 +05:30
JMA (OpenERP) 4cf1362e3b [FIX] Security fixes for sql injections 
bzr revid: jma@tinyerp.com-20100610133419-fwbc1xp0xoq77n90
 2010-06-10 19:04:19 +05:30
Fabien Pinckaers a3dd9f05dc [FIX] 3 security rules, [IMP] object names for logs 
bzr revid: fp@tinyerp.com-20100519183232-9zieyfnah526r312
 2010-05-19 20:32:32 +02:00
Xavier Morel 9c77a058d9 [merge] CampToCamp's multi company cost price branch 
bzr revid: xmo@tinyerp.com-20100215162033-j3st3yq2rz8a2gwx
 2010-02-15 17:20:33 +01:00
Joël Grand-Guillaume 8da7540388 [FIX] According to Xavier (OpenERP) to fit OpenERP requierements : remove commented code, use != instead of <>, fix picking wizard. 
bzr revid: joel.grandguillaume@camptocamp.com-20100215103948-cbnngoh2px14pk6a
 2010-02-15 11:39:48 +01:00
Joël Grand-Guillaume 3fbfcac731 [MRG] Merge the last trunk in order to ease the merge from Tiny 
bzr revid: joel.grandguillaume@camptocamp.com-20100211145043-w9zwltan97u0obk5
 2010-02-11 15:50:43 +01:00
HDA (OpenERP) 93bd614c8e merged to remove sql injection 
bzr revid: hda@tinyerp.com-20100201082939-fj0u5f0pvlgq7j3k
 2010-02-01 13:59:39 +05:30
Joel Grand-Guillaume 9478383420 [MRG] Merge last trunk to post again my proposal 
bzr revid: joel.grandguillaume@camptocamp.com-20100122131132-jdg4hqgcnyyl8qva
 2010-01-22 14:11:32 +01:00
Stephane Wirtel fb3ef7a2f4 [FIX] Change the year of the copyright 
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
 2010-01-12 10:18:39 +01:00
Joel Grand-Guillaume 4a628b63d7 [COM] All indicators in account analytic analysis are now well computed, according to account currency, except theorical revenue and amount to invoice because they don't take care of pricelist neither account currency. 
bzr revid: joel.grandguillaume@camptocamp.com-20091223103837-etie8lovwb2twwbh
 2009-12-23 11:38:37 +01:00