38dd957438
[MERGE] Merge with main branch
...
bzr revid: mra@tinyerp.com-20100520041631-90wyd7ouhnpgwy6a
2010-05-20 09:46:31 +05:30
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
84dfed9da7
[IMP] account, hr_contract, hr_timesheet, project: small changes, clean
...
bzr revid: psi@tinyerp.co.in-20100519130703-fgog8lo8zgh8g4rk
2010-05-19 18:37:03 +05:30
bc719175f8
[REM,IMP]: partner_infotab: Removed partner_infotab, put the details in respective modules(crm, account)
...
bzr revid: rpa@tinyerp.com-20100513141536-5t2nr95ec2wnll6b
2010-05-13 19:45:36 +05:30
e94611f53f
[FIX] analytic account & project
...
bzr revid: fp@tinyerp.com-20100429054614-8okq2qk3kiskvaex
2010-04-29 07:46:14 +02:00
147e1f2c83
[MERGE] From Joel GrandGuillaume (Camp2Camp)
...
bzr revid: stephane@openerp.com-20100325133524-bopyjvq6dr6xq0xr
2010-03-25 14:35:24 +01:00
942ac8de0b
[IMP] Add the multi-currency support on product costs. You can now have different costs price for each company, but in the same currency even if your company are in different one
...
bzr revid: joel.grandguillaume@camptocamp.com-20100325105936-btwdqg96jt723l2r
2010-03-25 11:59:36 +01:00
1091830208
[IMP] configurable digits in floats per application
...
bzr revid: fp@tinyerp.com-20100306205219-pg1r78deq76t2jg2
2010-03-06 21:52:19 +01:00
284ec3e006
Merged with client
...
bzr revid: hda@tinyerp.com-20100216142723-ul7m7do5fpl3r9av
2010-02-16 19:57:23 +05:30
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
43cc32e7a3
[MERGE] merge from trunk addons3
...
bzr revid: pso@tinyerp.com-20110103110849-xch0rt0zy2tten4e
2011-01-03 16:38:49 +05:30
231c5c04c2
[FIX] Unable to validate supplier invoice/refund with reference greater than 32 characters. The reference is used as reference for the move lines and the analytic account line but the reference of these objects are limited to 32 characters, raising an sql error. It also broke the workflow of the invoice.
...
lp bug: https://launchpad.net/bugs/518914 fixed
bzr revid: chs@tinyerp.com-20100208171726-3nabrcko8q8zo215
2010-02-08 18:17:26 +01:00
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
fb3ef7a2f4
[FIX] Change the year of the copyright
...
bzr revid: stephane@openerp.com-20100112091839-a6p7tenhb4e4zxyx
2010-01-12 10:18:39 +01:00
90ddcec2d7
[API] Remove date from onchange_unit_amount from analytic line, cause they are no more used as we base computation on pricetype
...
[FIX] Start to replace standard_price in everymodule with the right field according to company property
bzr revid: joel.grandguillaume@camptocamp.com-20091223163453-1a1y2pu9kmrzbep4
2009-12-23 17:34:53 +01:00
ffd766bd42
[IMP] Change pricelist for price type into company property
...
[IMP] Change all valuation according to price type instead of pricelist
[IMP] Compute the aveerage price based on the define price type in the company, this allow company to have different cost price
bzr revid: joel.grandguillaume@camptocamp.com-20091223152806-cacd3e8loi7tea53
2009-12-23 16:28:06 +01:00
80588b9d0b
[ADD,IMP]: Added tooltips for some fields, Improved tooltips for product view.
...
bzr revid: uco@tinyerp.co.in-20091223131247-a3usqpicc17sjisv
2009-12-23 18:42:47 +05:30
d8500896c9
[IMP] Add trigger on account.analytic.line for currency change
...
[IMP] Refactoring the _balance_calc in project.py
[FIX] Use the new refactored funtion to compute indicator in right the currency according to each level of analytical account
bzr revid: joel.grandguillaume@camptocamp.com-20091223095520-8gsqff2w7z0yrc7z
2009-12-23 10:55:20 +01:00
497c1bed05
[FIX] Correct debit, credit and balance on analytic account in order to give it in account currency
...
[IMP] Always compute amount in currency, to allow debit,credit,balance computation
bzr revid: joel.grandguillaume@camptocamp.com-20091223085137-pzuzatuknoluuhuh
2009-12-23 09:51:37 +01:00
ee076f30df
[FIX] Correct typo into account in order to allow compilation
...
bzr revid: joel.grandguillaume@camptocamp.com-20091223075256-k6tmy2wbc8delay7
2009-12-23 08:52:56 +01:00
a0bd469d55
Merge from trunk
...
bzr revid: joel.grandguillaume@camptocamp.com-20091223073733-jpekbt4hhjklgbfk
2009-12-23 08:37:33 +01:00
c1d66e1ac5
[IMP]: Generalization of tooltips: Added tooltips for 'origin' fields, renamed 'Ref' to 'Reference', Added same tooltips for same fields of 'account & account template' and 'tax & tax templates'
...
bzr revid: uco@tinyerp.co.in-20091222093841-2uamhp6w0wkmcnk0
2009-12-22 15:08:41 +05:30
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
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
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
eb0b928cc0
Changed licencing terms
...
bzr revid: hda@tinyerp.com-20091014111534-1vtk21rz8byhszzf
2009-10-14 16:45:34 +05:30
41e8ed59ef
changed encoding to coding in all py files
...
lp bug: https://launchpad.net/bugs/357182 fixed
bzr revid: hda@tinyerp.com-20091013055837-3ntnbe8b938xmk97
2009-10-13 11:28:37 +05:30
5b43b63c4d
[FIX] Account : Correction of search method arguements of account.analytic.line
...
lp bug: https://launchpad.net/bugs/387029 fixed
bzr revid: jvo@tinyerp.com-20090615071829-3cgnxn60204p72ag
2009-06-15 12:48:29 +05:30
3dbc04b030
Fix : Bug #373186 :
...
bzr revid: apa@tinyerp.com-20090508072020-x4sbncr6d2a3x720
2009-05-08 12:50:20 +05:30
2d281b5f63
Merged Trunk to addons/5.0
...
bzr revid: jvo@tinyerp.com-20090409100219-5bo156xq8k24qmru
2009-04-09 15:32:19 +05:30
ca068d9e3b
Analytic chart of Accounts: according to context and period
...
bzr revid: jvo@tinyerp.com-20090408143550-dj2zhfz3sc6c77o5
2009-04-08 20:05:50 +05:30
cb12465124
[IMP]: Improved sale journal report views. Removed This Month/All Months menus.
...
bzr revid: uco@tinyerp.co.in-20091210073041-d1cyuwb9f28aqvfc
2009-12-10 13:00:41 +05:30
21f104a506
[IMP] Update the copyright to 2009
...
bzr revid: stephane@tinyerp.com-20090104221250-55q32ayj2t8kzb2k
2009-01-04 23:12:50 +01:00
1a0de2f0f9
[FIX] psycopg2: %d -> %s
...
bzr revid: christophe@tinyerp.com-20081210142955-ewfr1qhzq9l1tjzn
2008-12-10 15:29:55 +01:00
2a6c4517d2
improve
...
bzr revid: fp@tinyerp.com-20081121110455-il97xlk4bk50uojm
2008-11-21 12:04:55 +01:00
f5fad0ba30
passing modules in GPL-3
...
bzr revid: christophe@tinyerp.com-20081103191856-jhcivvwb16fvz2os
2008-11-03 20:18:56 +01:00
9dbe80c900
modifs
...
bzr revid: christophe@tinyerp.com-20081103190855-uzumzgtbuyikf70b
2008-11-03 20:08:55 +01:00
b0c241ef3b
bugfix
...
bzr revid: fp@tinyerp.com-20080923060056-451wx2kq2rl5rqcm
2008-09-23 08:00:56 +02:00
05d3922751
Better Warning Message when employee misconfigured for timesheet
...
lp bug: https://launchpad.net/bugs/259465 fixed
bzr revid: fp@tinyerp.com-20080819223820-znehuxw9ikxo9qqs
2008-08-20 00:38:20 +02:00
3e3d897e88
add encoding comment and vim comment
...
bzr revid: christophe@tinyerp.com-20080723144147-77o5t9adx26a84lt
2008-07-23 16:41:47 +02:00
d2ff95f665
replace tabs with 4 spaces
...
bzr revid: christophe@tinyerp.com-20080722151128-f5zy75tsn8pgtndd
2008-07-22 17:11:28 +02:00
1f43329f0e
* translation of nearly all exceptions
...
* the export of translations per module take only the files of these modules
bzr revid: chs@tinyerp.com-77721e34d87043c4008239f004c7c616f6d4dc82
2008-07-08 08:13:12 +00:00
0feb782c6a
add Copyright and GPL license into the Header of Python files
...
bzr revid: stw-d9a6d631f7cfdab5a120a6b0104ce2dbf8644841
2008-06-16 11:00:21 +00:00
44c66c7f34
Fix uom conversion in analytic line
...
bzr revid: ced-cd42cc44fdc260bca64f66a2e599c02621dd9733
2007-12-17 07:58:40 +00:00
b04c030791
Fix cost & revenue on analytic account
...
- remove limit 12 -> doesn't work
- remove from one2many because there is no limit
- improve the relate button
bzr revid: ced-9f3ba0b26721f6d322cb4760cc55284379ea1696
2007-09-20 14:00:18 +00:00
47fa5401cb
Now property are also browse record
...
bzr revid: ced-315ea94bfeeaec57242089e941c1da0eb6b6b074
2007-08-09 06:06:56 +00:00
1affdedfd3
Merge branch 'master' of ssh://ced@dev.tinyerp.com//home/ced/terp
...
Conflicts:
server/bin/addons/hr_timesheet_invoice/report/cost_ledger.py
bzr revid: ced-53d5b1eb97f770d60b281ecb4ff118898d110112
2007-07-19 13:47:25 +00:00
99b8134a10
account: change ambigous variable name
...
bzr revid: ced-7abf6011a16e089613e60bebf2a3f2b6b8663704
2007-07-19 13:36:44 +00:00
0a31058c9a
account: add test for expence account in analytic line
...
bzr revid: ced-95e77f7f90068d522adc4af256c235e4b4785cef
2007-07-02 13:06:19 +00:00
4b03036000
Analytic accounts statistics
...
Bugfix in debit/credit computation
Graph view
bzr revid: fp@tinyerp.com-a0b7dbc288760ee7054b3ad5df83afc498c70ab8
2007-06-21 16:12:59 +00:00
e980813d4d
CLIENT,KERNEL: new tag act_window for new relate implementation
...
bzr revid: ced-774fa598d18bfb26cf59e94de536c6afd5bf531b
2007-05-24 05:26:36 +00:00
c5b1fbc478
ACCOUNT: add multi-company into base accounting
...
bzr revid: mga@tinyerp.com-9d1120f18bae244eeb46ca3a8f00919a8498058b
2007-03-28 14:41:48 +00:00
acd61272e4
ACCOUNT: product_id is not required
...
bzr revid: ced-ee087bb2aad410f716fc8a4d1bbeca39197fad4e
2007-03-13 13:12:19 +00:00
aff1caa0de
HR_TIMESHEET,ACCOUNT: increase size to 256 for analytic line description
...
bzr revid: ced-bb3955e3f2384b5f056e78bfcf72e497a9f2699c
2007-03-09 10:10:56 +00:00
e12814a760
Modifs
...
bzr revid: pinky-461ff6da5535da6953f5b9ef79c3cecbfe42ae5c
2007-03-06 09:57:35 +00:00
13bc7d36b1
ACCOUNT: add ref to analytic line, HR_TIMESHEET_INVOICE: add final invoice
...
bzr revid: ced-9422c619a669a2e335ee6cee8cd7304b49cbd65c
2007-02-08 11:48:36 +00:00
b4af1461c4
HR_TIMESHEET_INVOICE: improve create invoice
...
bzr revid: ced-93af4c09cfc8446aad3e104aea1b65ec905a5915
2007-01-23 15:17:17 +00:00
439d7a5a90
ACCOUNT:
...
* bank statment line now have a ref t othe corresponding invoice.
* account.py splitted for depedendy reason.
L10N_CH: debug
bzr revid: bch-cd59941716bff05a29b95739b303b6f1c2a859a8
2007-01-04 09:45:50 +00:00
mra (Open ERP)
Fabien Pinckaers
psi (Open ERP)
rpa (Open ERP)
Stephane Wirtel
Joël Grand-Guillaume
HDA (OpenERP)
pso
Christophe Simonis
uco (OpenERP)
Panos Christeas
PSO(OpenERP)
Jay (Open ERP)
Apa (Open ERP)
Stephane Wirtel
Christophe Simonis
Mantavya Gajjar