Commit Graph
197 Commits
Author SHA1 Message Date
Fabien Pinckaers d9a506bb4c merge
bzr revid: fp@tinyerp.com-20100406161510-u7t9vi4kxlm30l6y
2010-04-06 18:15:10 +02:00
Launchpad Code Hosting 05d11f2aa5 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100330035116-gmj49lv1faqo4cy7
bzr revid: codehost@crowberry-20100330041710-6ri9dskhty8ledl3
2010-03-30 05:17:10 +01:00
nel@tinyerp.com d433c53595 [IMP] Improve layout
bzr revid: nel@tinyerp.com-20100329114535-th525ey9uv9at6ws
2010-03-29 13:45:35 +02:00
Launchpad Code Hosting c4a4cebdd2 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100321044306-wlt0ryirr2s3wrc1
2010-03-21 04:43:06 +00:00
apa-tiny 188492607c [REM/MOVE]:moved the report_timesheet module into the hr_timesheet_invoice module and removed the report_timesheet module.
bzr revid: apa@tinyerp.com-20100316054958-iam0p7psf5izwkzf
2010-03-16 11:19:58 +05:30
Vir (Open ERP) 2b5d295153 [Merge]
bzr revid: vir@tinyerp.com-20100316050133-gjdej71jk1ncvs81
2010-03-16 10:31:33 +05:30
apa-tiny 9c6b0c5fa7 [REM/MOVE]:moved the report_analytic files in hr_timesheet_invoice module and removed the report_analyatic module.
bzr revid: apa@tinyerp.com-20100312124247-8ojsf86doe2304bg
2010-03-12 18:12:47 +05:30
Launchpad Code Hosting 1c2abb3388 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100311050546-f8c8w09auz4m064f
2010-03-11 05:05:46 +00:00
Launchpad Code Hosting 38544141cc Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100310051152-olke65fg5ytdk4d5
2010-03-10 05:11:52 +00:00
Harry (Open ERP) 713ee22c90 [MERGE] HR Improvement
bzr revid: hmo@tinyerp.com-20100219104719-5e2pb5mweuqcuie6
2010-02-19 16:17:19 +05:30
Vir (Open ERP) 7cd3e2d582 [IMP,ADD] New submenus are created for HR -> Reporting according to holidays,timesheet,applicant. and changes in sequences
bzr revid: vir@tinyerp.com-20100218101535-w9ib79wu02sahd5p
2010-02-18 15:45:35 +05:30
Launchpad Code Hosting c4eb6939d2 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100217045454-khoxol7nwp9481bx
bzr revid: codehost@crowberry-20100217045700-n98jpo3k13wuor6b
2010-02-17 04:57:00 +00: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
Launchpad Code Hosting af003ddfa0 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100213045823-qdci4lesy2tcbnhe
bzr revid: codehost@crowberry-20100214050039-6qf8txq3a10fzoh6
bzr revid: codehost@crowberry-20100215044857-73ar6224y5uvmorb
2010-02-15 04:48:57 +00: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
Launchpad Code Hosting 0ded9e51d5 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100129045238-ybmg27bj2zul9irm
bzr revid: codehost@crowberry-20100129045314-rnh9cidbxud6fxku
2010-01-29 04:53:14 +00:00
Launchpad Code Hosting ff17d3f1e7 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100128043536-mnzubc6yhqg38zir
2010-01-28 04:35:36 +00:00
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
HDA (OpenERP) 0b2bb31992 Merge from stable
bzr revid: hda@tinyerp.com-20100121151350-58pcefq2tdw2ge2l
2010-01-21 20:43:50 +05:30
Jay (Open ERP) fdbe67292c [FIX] Added Missing import statements of translations( from tools.translate import _)
lp bug: https://launchpad.net/bugs/510217 fixed

bzr revid: jvo@tinyerp.com-20100121120123-k9hvy4nvegqf1vav
2010-01-21 17:31:23 +05:30
RCH(Open ERP) bf3cad60e5 [FIX,MOD] HR Modules : Problem of showing report menu display is solved
bzr revid: vir@tinyerp.com-20100118102321-qofcjwr4ldakji8w
2010-01-18 15:53:21 +05:30
VRA(OpenERP) 05a76846f2 [FIX] Analytic account report corrected
bzr revid: jvo@tinyerp.com-20100113113110-1sl57vr454pi8w4j
2010-01-13 17:01:10 +05:30
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
Fabien Pinckaers 344dd181f3 [IMP] new menus
bzr revid: fp@tinyerp.com-20100109143002-32gkcy67d18v2gd7
2010-01-09 15:30:02 +01:00
Launchpad Code Hosting 4b560a5f40 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091230044751-64u7xrq53ujjdbhe
2009-12-30 04:47:51 +00:00
Joel Grand-Guillaume a0bd469d55 Merge from trunk
bzr revid: joel.grandguillaume@camptocamp.com-20091223073733-jpekbt4hhjklgbfk
2009-12-23 08:37:33 +01:00
uco (OpenERP) c9f66f69f0 [IMP]: Tooltip improvements: Typo errors and improvements
bzr revid: uco@tinyerp.co.in-20091221095054-do0gbj9907u3oyxc
2009-12-21 15:20:54 +05:30
Launchpad Code Hosting 225c229780 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091219043342-g6yxefj169bgeka3
bzr revid: codehost@crowberry-20091220043618-ahq2v3u2j5al90n1
bzr revid: codehost@crowberry-20091221044337-amjdbdasgxnofbfi
2009-12-21 04:43:37 +00:00
Joel Grand-Guillaume 97d33b0da5 [IMP] Add trigger on analytic line, so currency and amount currency are recomputed if company change
[REM] Remove the currency_id of analytic account to be computed based on sale pricelist,
    it's now the reported company currency_id
[ADD] some demo to demo data provided by multicompany module

bzr revid: joel.grandguillaume@camptocamp.com-20091217164253-3jwugrn14mkj21pe
2009-12-17 17:42:53 +01:00
Joel Grand-Guillaume d3c8dc2db4 [IMP] Add computation of stock entries based on
valuation priclist of company for accounting entries

bzr revid: joel.grandguillaume@camptocamp.com-20091217151233-85fnrq17pt2o7w7n
2009-12-17 16:12:33 +01:00
Joel Grand-Guillaume ff19c0f96b Account:
[ADD] Field company_id on account.analytic.line
[ADD] Function Field currency_id, amount_currency on account.analytic.line, 
on account.analytic.account currency_id
[ADD] Function field currency_id on account.analytic.account = company currency
[API] Change the on_change_unit_amount signature, adding date and company_id
[IMP] Change the on_change_unit_amount funtcion to base cost price on valuation
 instead of standard price.

Product:
[ADD] Add a new property called property_valuation_pricelist into res.company.
purpose of this pricelist is to compute the cost price for a given 
y.

Hr_timesheet:
[API] Change the on_change_unit_amount signature, adding date

Hr_timesheet_invoice
[IMP] Function field currency_id of account.analytic.account base computation
  pricelist currency instead of company currency  

Hr_timesheet_sheet:
[IMP] Add support of new signature for on_change_unit_amount

bzr revid: joel.grandguillaume@camptocamp.com-20091217141332-23u4v79m3pbst7u9
2009-12-17 15:13:32 +01:00
Launchpad Code Hosting a9c86247e9 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091216052733-5xwug0h8x6g89bqt
2009-12-16 05:27:33 +00:00
Launchpad Code Hosting 436709e71d Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091212044324-cijmtvsyi4a4s45o
bzr revid: codehost@crowberry-20091213043736-z24gvovoapw9qp00
bzr revid: codehost@crowberry-20091214043619-objwljpa4vzg82dl
2009-12-14 04:36:19 +00:00
VRA,JVO 19f772dcff [FIX] Hr_timesheet_invoice : Line once invoiced,should not be invoiced again
lp bug: https://launchpad.net/bugs/440248 fixed

bzr revid: jvo@tinyerp.com-20091210094049-2w1lkfac1b6kykdr
2009-12-10 15:10:49 +05:30
olt@tinyerp.com 91191edeee [IMP] Launchpad export translation files
bzr revid: olt@tinyerp.com-20091209131947-pxqt2nbuci12i0m9
2009-12-09 14:19:47 +01:00
uco (OpenERP) e2800161ee [Merge]: Merge with parent
bzr revid: uco@tinyerp.co.in-20091208130823-7ot135wtk2jt311q
2009-12-08 18:38:23 +05:30
Launchpad Code Hosting 4bf94392bf Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091205044307-6qhjd3nbo6gwtys7
bzr revid: codehost@crowberry-20091206044413-l2j8irzc2l9932vf
2009-12-06 04:44:13 +00:00
uco (OpenERP) 999f811faa [REF]: Removed menu items 'New..' and 'My..' and also its related actions
bzr revid: uco@tinyerp.co.in-20091201114826-nponzy9okhrjt8zs
2009-12-01 17:18:26 +05:30
Harry (Open ERP) 148d079485 [MERGE] merge from lp:~hmo-tinyerp/openobject-addons/p_christeas_addons/
bzr revid: hmo@tinyerp.com-20091130112301-mba4ea9byoyb5cbz
2009-11-30 16:53:01 +05:30
nch@tinyerp.com 7d1b6aadb5 [MERGE]
bzr revid: nch@tinyerp.com-20091127084026-qmju10co18vkywrd
2009-11-27 14:10:26 +05:30
Panos Christeas 8d0b4a7418 [MERGE] merge from lp:~xrg/openobject-addons/doc2-5.2
bzr revid: hmo@tinyerp.com-20091126135400-z32iycvadbt9so8n
2009-11-26 19:24:00 +05:30
nch@tinyerp.com 486352c771 [IMP]:hr_timesheet_invoice sql queries to parameterized query
bzr revid: nch@tinyerp.com-20091126070714-rn464yyoz7rr72gz
2009-11-26 12:37:14 +05:30
uco (OpenERP) 48ad8cb5f3 [MERGE]: Merged with parent branch
bzr revid: uco@tinyerp.co.in-20091124073138-iuhih9evjq90e1ne
2009-11-24 13:01:38 +05:30
Launchpad Code Hosting fc896c18e1 Launchpad automatic translations update.
bzr revid: codehost@crowberry-20091121044610-tjrx7la00uxma6de
bzr revid: codehost@crowberry-20091122044933-ihaqkrgt1aoagncx
bzr revid: codehost@crowberry-20091123045019-jio3znf671fao8rl
bzr revid: codehost@crowberry-20091124043926-b8puhodw1lp0p9pn
2009-11-24 04:39:26 +00:00
uco (OpenERP) 47a820f7a1 [ADD]: Added tooltips for all state fields.
bzr revid: uco@tinyerp.co.in-20091123135238-oadv1oyefpsi9631
2009-11-23 19:22:38 +05:30
uco (OpenERP) 50ee2493f4 [IMP]: remove all menus (and their related actions) and keep
bzr revid: uco@tinyerp.co.in-20091123052917-bj8x7mvtyqt41w72
2009-11-23 10:59:17 +05:30
mra (Open ERP) 47ed92c176 [IMP] remove and rename po files in all modules available on addons for launchpad translation synchronization
bzr revid: mra@tinyerp.com-20091120115956-noox8bji102anmsj
2009-11-20 17:29:56 +05:30
uco (OpenERP) 5585eec06d [REF]: Changes in i18n translation files.
bzr revid: uco@tinyerp.co.in-20091120072316-0qrxmm4bjjyprczh
2009-11-20 12:53:16 +05:30