09c62b0d02
[MERGE] with trunk
...
bzr revid: fka@tinyerp.com-20130613071422-9iw22gkm33epbkpb
2013-06-13 12:44:22 +05:30
fea1eaf1d6
[MERGE]sync with parent
...
bzr revid: sgo@tinyerp.com-20130610050015-cuk6adbhzsmaas8s
2013-06-10 10:30:15 +05:30
487fb98a20
[MERGE] MergeD lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130607131651-ra85hgmf6ivmsq2i
2013-06-07 18:46:51 +05:30
9d9e3d2ef8
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607113829-1mi6jk18c2v3jjhn
2013-06-07 13:38:29 +02:00
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
d3c7f6becf
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130605070737-5sdnhqzysi1lcnnj
2013-06-05 12:37:37 +05:30
0f983a0146
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
...
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
2013-06-03 14:18:52 +02:00
17a618eb89
[MERGE] [FIX] context is not propagated through account_period.name_search to account_period.search, courtesy of Guewen Baconnier (Camptocamp)
...
lp bug: https://launchpad.net/bugs/1177348 fixed
bzr revid: mat@openerp.com-20130528152327-zq382uvqn9h3ja83
2013-05-28 17:23:27 +02:00
24848a8dcc
[MERGE] merge with latest trunk
...
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
2013-05-28 14:49:41 +05:30
71df1a41bc
[FORWARD] Forward port of addons 7.0 until revision 9172
...
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
a1bbb140b3
[IMP] account: use digits precision of account +3 for account.tax and templates
...
bzr revid: mat@openerp.com-20130527085957-xq6zwmc3lhn6yy83
2013-05-27 10:59:57 +02:00
2120812002
[IMP] Little improvement.
...
bzr revid: psa@tinyerp.com-20130524115613-vnj5i3pe0nc9rkdv
2013-05-24 17:26:13 +05:30
05432c1565
[MERGE] MErged lp:openobject-addons.
...
bzr revid: psa@tinyerp.com-20130524114959-s2pnc203w93ybzfv
2013-05-24 17:19:59 +05:30
7ca85ffbba
[FIX] account: exclude company_id from build_ctx_periods()'s criteria to allow printing consolidated reports
...
bzr revid: qdp-launchpad@openerp.com-20130523122756-tpkc268q107hiqvy
2013-05-23 14:27:56 +02:00
3b87fc2c87
[IMP] add help in use_preprint_check and change help text for Check Date in Period in journal form view
...
bzr revid: fka@tinyerp.com-20130508070733-h8lnupl2vc530ks9
2013-05-08 12:37:33 +05:30
1c4bdf3061
[FIX] context is not propagated through account_period.name_search to account_period.search
...
lp bug: https://launchpad.net/bugs/1177348 fixed
bzr revid: guewen.baconnier@camptocamp.com-20130507115306-lrnb0t3139lfxtie
2013-05-07 13:53:06 +02:00
1b08798b52
[TYPO]changes in typo
...
bzr revid: vja@tinyerp.com-20130430072547-7gyl7nivdc8717ua
2013-04-30 12:55:47 +05:30
9c08e12962
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9085
...
revision-id: odo@openerp.com-20130429105458-r89mnkx8okdxsdld
bzr revid: odo@openerp.com-20130429151410-54y94063gijyk16o
2013-04-29 17:14:10 +02:00
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
7e46260474
[FIX] account: modified the constraint on account.move.reconcile in order to allow the reconciliation to be made on different partners if it doesn't concern a payable or receivable account
...
bzr revid: qdp-launchpad@openerp.com-20130423125731-dblhpx7zz4q9x464
2013-04-23 14:57:31 +02:00
429ef87172
[MERGE] accounts* modules: forward port of revision 9033 of addons v7 that was passing 'account_period_prefer_normal=True' in the context in each and every call to account_period.find(). The behaviour is modified in order to search only on normal periods by default
...
bzr revid: qdp-launchpad@openerp.com-20130418094147-q2ks4w47sn4fxdv2
bzr revid: qdp-launchpad@openerp.com-20130418103907-0qom5yfcq8osnovp
2013-04-18 12:39:07 +02:00
c46929268d
[FIX] account* modules: added 'account_period_prefer_normal':True in context when trying to find the period related to a date.
...
This patch will be forward ported in trunk by changing the behaviour of account_period.find() in order to fetch the normal periods by default (account_period_prefer_normal will be True by default) because there are no business case i could think of where you'd like to get the opening period (except in the closure but it's held in a different way there). On the other hand, it's pretty easy to forget to put that key in the context and introduce a new bug that will select the opening period instead of the wanted one
bzr revid: qdp-launchpad@openerp.com-20130418102433-t52uj23trkpr8vnb
2013-04-18 12:24:33 +02:00
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
894eeef8e0
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130411073708-gaxl2332umtedmg6
2013-04-11 09:37:08 +02:00
3bb51ac696
[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.
...
bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj
2013-04-04 11:52:57 +02:00
d43b932270
[FIX] Forwardport of 6.1 fix by han: Do not copy the statement_id value when copying account moves
...
bzr revid: cbi@openerp.com-20130404090948-c7zw5yco1sply0b8
2013-04-04 11:09:48 +02:00
96ad608854
[IMP] general: use registry[X] instead registry.get(X) when X is dynamic
...
bzr revid: rco@openerp.com-20130329143720-80pkd4csemlk1aqz
2013-03-29 15:37:20 +01:00
245f0fe9f8
[REF] account: removed openerp.pooler imports.
...
bzr revid: vmt@openerp.com-20130327134337-rpktoa5gj31iof5c
2013-03-27 14:43:37 +01:00
fb82744bac
[IMP] Improved.
...
bzr revid: psa@tinyerp.com-20130322120533-n6oofcl1c7d532cb
2013-03-22 17:35:33 +05:30
22cd9a5c13
[IMP]Improve label and help of /Skip 'Draft' State for Manual Entries/
...
bzr revid: psa@tinyerp.com-20130322111715-qbxuq3166o0z2puc
2013-03-22 16:47:15 +05:30
227617dd9f
[IMP] account: changed string for fields 'ref_base_sign' & 'ref_tax_sign' in 'account.tax'
...
bzr revid: cha@tinyerp.com-20130320093921-irhg67f639s7xvcx
2013-03-20 15:09:21 +05:30
7fb1818900
[IMP] account: changed string for fields 'ref_base_sign' & 'ref_tax_sign' in 'account.tax.template'
...
bzr revid: cha@tinyerp.com-20130320092042-dyzb4rl3w2hi4c7e
2013-03-20 14:50:42 +05:30
76cc5abd98
[MERGE]: merge with lp:openobject-addons
...
bzr revid: cha@tinyerp.com-20130320072744-bs2e9hvc611mf6ci
2013-03-20 12:57:44 +05:30
cd164a8bc9
[MERGE] v7
...
bzr revid: qdp-launchpad@openerp.com-20130313110304-8fivajfr9779x58s
2013-03-13 12:03:04 +01:00
8670be1fde
[IMP] account: made little change
...
bzr revid: cha@tinyerp.com-20130313105709-hg2wzl87q3io6189
2013-03-13 16:27:09 +05:30
7a14260535
[IMP] account: change string of three fields to solve import issue of 'Taxes'
...
bzr revid: cha@tinyerp.com-20130312105516-4eidfo5322rbb6tc
2013-03-12 16:25:16 +05:30
aaf11ba8a8
[IMP] account: change string of three fields to solve import issue of 'Tax Templates'
...
bzr revid: cha@tinyerp.com-20130312103230-b09wzh3vlm28expi
2013-03-12 16:02:30 +05:30
9446f1d291
[MERGE] v7.0
...
bzr revid: qdp-launchpad@openerp.com-20130306162854-q3d41kqf51vnske8
2013-03-06 17:28:54 +01:00
1bed52ec67
[FIX] account, duplicate of account.tax: better fix for problem fixed in revision 8807.
...
fixed the duplicate of tax (wasn't working because of a unique constraint on name field). The previous fix was working only for taxes that doesn't have any child. The reason is that copy() is never called for one2many fields, only copy_data() is called (and give the same results for other fields)
bzr revid: qdp-launchpad@openerp.com-20130307090408-cxb1qcfz4n9ksrg5
2013-03-07 10:04:08 +01:00
cdabf79cf2
[REF] hr_expense, creation of accounting entries from hr.expense: a lot of code refactoring. Still a huge work to be done in order to factorize some code with other objects (like account.invoice, account.voucher, account.asset...)
...
bzr revid: qdp-launchpad@openerp.com-20130306140554-fhs6fhkyb779t6re
2013-03-06 15:05:54 +01:00
7f8d7e3518
[FIX] account: fixed the duplicate of tax (wasn't working because of a unique constraint on name field)
...
bzr revid: qdp-launchpad@openerp.com-20130306132543-4kqiwuvoo61h18qs
2013-03-06 14:25:43 +01:00
efbb25bae3
[FIX] account: missing ondelete cascade rule on m2o between 2 TransientModels
...
bzr revid: csn@openerp.com-20130129133427-ar1wiknf0ck15257
2013-01-29 14:34:27 +01:00
26f5b8b7bf
[FIX] account: when generating the opening entries, do not copy the last partner on the centralisation lines (was set in default_get) but force it to False
...
bzr revid: qdp-launchpad@openerp.com-20130107135507-jfm7ptd64zlldrqr
2013-01-07 14:55:07 +01:00
d4fe5a47f3
[FIX] account: put a restriction to re-open a period which belongs to
...
> the closed fiscal year,
it must not be possible to re-open a period and post journal items when its fiscal year is closed
bzr revid: rha@tinyerp.com-20130123103911-trxfkv0kemltvdv5
2013-01-23 16:09:11 +05:30
0d8b961905
[IMP] improve the string in account
...
bzr revid: rma@tinyerp.com-20121219072915-bd84k8220m6dsgm1
2012-12-19 12:59:15 +05:30
bb43d29605
[IMP] improve the string in account
...
bzr revid: rma@tinyerp.com-20121219072537-8szdtp4nmz5xr2hh
2012-12-19 12:55:37 +05:30
fc0c2942ba
[MERGE] Another batch of bugfixes from 6.1
...
bzr revid: odo@openerp.com-20121218175547-7c1uxq4ypbi314gx
2012-12-18 18:55:47 +01:00
b67f73c327
[MERGE] Sync with trunk
...
bzr revid: odo@openerp.com-20121218025230-zig415ldtmazgbxt
2012-12-18 03:52:30 +01:00
84d7987f33
[MERGE] Bugfixes from 6.1 until revision 6900
...
rev.6900 = xal@openerp.com-20120720134532-t07xr3lp8ouhn2dv
bzr revid: odo@openerp.com-20121218021123-9ligpn7bkr9zo4n7
2012-12-18 03:11:23 +01:00
15fe515601
[MERGE] From trunk
...
bzr revid: cto@openerp.com-20121217144306-tkodwpox30cuvb28
2012-12-17 15:43:06 +01:00
d9b7d8155e
[IMP] multi-currency stuff
...
bzr revid: fp@tinyerp.com-20121215162309-yav3g8hu50bp9wvv
2012-12-15 17:23:09 +01:00
6072fd11af
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20121210111654-0pm3pupnqqeip52n
2012-12-10 12:16:54 +01:00
87c8767999
[FIX] required on boolean warning
...
bzr revid: al@openerp.com-20121209194352-j6sv17tzh3bz4e1u
2012-12-09 20:43:52 +01:00
94d94a9d54
[IMP] implification of payment terms, it even works without balance line
...
bzr revid: fp@tinyerp.com-20121208135723-ori198g559b1sxsu
2012-12-08 14:57:23 +01:00
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
966890c540
[MERGE] merged the branch with supplier payment term from alexis de Lattre (Akretion). Thanks for the nice proposal
...
bzr revid: qdp-launchpad@openerp.com-20121204103146-9mfmx56ulfxrlphj
2012-12-04 11:31:46 +01:00
3640b0b5dd
[MERGE]: Merged change usability issue
...
bzr revid: atp@tinyerp.com-20121204073521-mzhbp1gozqdrle71
2012-12-04 13:05:21 +05:30
62d0f3931d
[IMP] Put a default value for payment term lines, make readonly amount to pay in list view, put % symbol when selection is percentage.
...
bzr revid: nco@tinyerp.com-20121204065850-dw3f79n61hla9x3c
2012-12-04 12:28:50 +05:30
7510092f7b
[MERGE] lp:~openerp-dev/openobject-addons/trunk-payment-term-creation-atp-imp-payment-term-form-view-pja
...
bzr revid: nco@tinyerp.com-20121204065402-qd9qdp19uzk84zsd
2012-12-04 12:24:02 +05:30
f24ec66090
[ADD]: Add immediate data in payment term.
...
bzr revid: atp@tinyerp.com-20121204062326-l0pexulus41zut59
2012-12-04 11:53:26 +05:30
f959595933
[IMP] balance computation line in payment term
...
bzr revid: shp@tinyerp.com-20121204051530-4sx9r9m0uqmapous
2012-12-04 10:45:30 +05:30
7b6d5f0e93
[IMP]remove sequece field and improve payment term form view
...
bzr revid: pja@tinyerp.com-20121204041610-vpqx0zf3rneokugx
2012-12-04 09:46:10 +05:30
017e2c2f77
[FIX] account creation
...
bzr revid: fp@openerp.com-20121202172651-0gtlf31avv8d01ti
2012-12-02 18:26:51 +01:00
cad4abe56c
Merge with addons/trunk revno 8168.
...
Adapt demo data to the rename of partner XML IDs in server/trunk.
bzr revid: alexis@via.ecp.fr-20121129222645-lm5ujxf4a1a83aoz
2012-11-29 23:26:45 +01:00
514952bdd3
[MERGE]Latest trunk
...
bzr revid: dle@openerp.com-20121128164105-m3hgq38xw6ikewa5
2012-11-28 17:41:05 +01:00
7db911f1c7
[REF] account: refactoring of default_get() of account.move.line
...
bzr revid: qdp-launchpad@openerp.com-20121123162758-qczz3bgbea2qzxjo
2012-11-23 17:27:58 +01:00
84050666ab
[REF] some code/error message refactoring
...
[REM] account: removed _check_fiscal_year constraint on account.move.line (was made to ensure a journal item's date is included inbetween the date start and stop of the fiscalyear it belongs) over which we have a doubt
[FIX] account: fixed _check_currency_and_amount constraint on account.move.line (having 0 as amount_currency is a legal value since debit and credit can both be 0 (used in case of complex taxes))
[FIX] account_voucher: changed the behavior in order to restrict the update of the journal in a bank statement only when there is a voucher already created/generated for that, because previous check was too restrictive.
bzr revid: qdp-launchpad@openerp.com-20121122142819-wvqak470vn3ete27
2012-11-22 15:28:19 +01:00
90c5bd38f2
[Fix] When creating an account move don't assume all the information will be supplied
...
In this specific instance validating a physical inventory caused the
account move creation code to fail because a period_id and a date were
not supplied. We can use the current period for period_id and date will
simply default to the current date if one is not supplied.
bzr revid: mmakonnen@gmail.com-20121122141618-5ksk1ke8gh75bssp
2012-11-22 17:16:18 +03:00
df1569f9f1
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20121122140800-1z8t57k0c2leaaqx
2012-11-22 15:08:00 +01:00
49f3f3d39f
[FIX]Too much deleted in _prepare_all_journals
...
bzr revid: dle@openerp.com-20121122115517-j1i3srgux7extgp8
2012-11-22 12:55:17 +01:00
7e6b2035ae
[DEL]View_id references missed
...
bzr revid: dle@openerp.com-20121122112729-0osh95257ssn5sxy
2012-11-22 12:27:29 +01:00
7e1ffaf613
[REM]Remove all account.journal.view and account.journal.column references
...
bzr revid: dle@openerp.com-20121122104504-ezgj2666zkhgybpj
2012-11-22 11:45:04 +01:00
d05caecd7e
[MERGE][FIX][IMP]Latest trunk + lots of things. I should have pushed more often, but its too late now : (
...
bzr revid: dle@openerp.com-20121121172954-qpnw0arhb632b8ve
2012-11-21 18:29:54 +01:00
5ead513bf2
[IMP] account : string changed
...
bzr revid: rpr@tinyerp.com-20121106092401-slfgkto8kvrv2o4v
2012-11-06 14:54:01 +05:30
76a5ceef15
[IMP] account : method code changed
...
bzr revid: rpr@tinyerp.com-20121106092152-sjyespyes2bxjrp2
2012-11-06 14:51:52 +05:30
43aefa10f6
[IMP] account : method name changed
...
bzr revid: rpr@tinyerp.com-20121106072825-6vza2ecmycimi4eo
2012-11-06 12:58:25 +05:30
f4f45c476c
[IMP] account : added constraints to check parent account
...
bzr revid: rpr@tinyerp.com-20121106062736-28vgz6515h4rt3s2
2012-11-06 11:57:36 +05:30
227738dedb
[IMP] Forbid to remove the reconcile on opening entries, we introduce a new boolean field to identify the reconciliation made by the closing process from others.
...
bzr revid: joel.grandguillaume@camptocamp.com-20121026135415-k1q0yq5zxngmfm5k
2012-10-26 15:54:15 +02:00
eaf53213da
[IMP] Forbid the user to delete any move linked to an invoice. Cancelling invoice still work obviously
...
bzr revid: joel.grandguillaume@camptocamp.com-20121026091242-9fu2a4do0ra50fqu
2012-10-26 11:12:42 +02:00
8132259454
[IMP] Add a constraints on reconcile object to forbid the reconciliation between different partner
...
[IMP] Add a constraint on account move: you cannot pickup a date that is not in the fiscal year of the concerned period
bzr revid: joel.grandguillaume@camptocamp.com-20121026084958-nlcoqlav00l42gwr
2012-10-26 10:49:58 +02:00
aef8541bc8
[IMP] Forbid to change type of account for 'consolidation' and 'view' if there is entries on it or his children.
...
bzr revid: joel.grandguillaume@camptocamp.com-20121025134702-7px784iu3226qc0l
2012-10-25 15:47:02 +02:00
e242773cac
[IMP] For legal reason (forbiden to modify journal entries which belongs to a closed fy or period) : Forbid to modify the code of an account if journal entries have been already posted on this account. This cannot be simply 'configurable' since it can lead to a lack of confidence in OpenERP and this is what we want to change.
...
bzr revid: joel.grandguillaume@camptocamp.com-20121025133851-3mnvsy9ltavys94k
2012-10-25 15:38:51 +02:00
a7368145ca
[MERGE] typo
...
bzr revid: fp@openerp.com-20121024201424-98la8f2wkhfjrtae
2012-10-24 22:14:24 +02:00
5b4fde2485
[FIX] account: the readonly fields aren't send to the server at the record creation
...
bzr revid: qdp-launchpad@openerp.com-20121019133050-7h8gx3beir992xlw
2012-10-19 15:30:50 +02:00
8346293d72
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20121015090200-irfaskfn9i1p68j9
bzr revid: mma@tinyerp.com-20121016052513-vl56jxtp7xbpa2ry
2012-10-16 10:55:13 +05:30
d56be2c622
[REF] account: removed dead field 'property_reserve_and_surplus_account' that was not used anymore
...
bzr revid: qdp-launchpad@openerp.com-20121015114847-j2po052ckxtgegqc
2012-10-15 13:48:47 +02:00
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
1d365f0d50
[MERGE]
...
bzr revid: fp@openerp.com-20121010204733-eqg9lhokufm387tr
2012-10-10 22:47:33 +02:00
536741bcd3
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20121003080711-d8g4kcdpeet3ovne
2012-10-03 10:07:11 +02:00
2b2288a3bd
[FIX] a few problems introduced with the last merge
...
bzr revid: abo@openerp.com-20121002111231-zo41jejkrm8afavu
2012-10-02 13:12:31 +02:00
1653332080
[MERGE] trunk
...
bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw
2012-10-02 12:29:15 +02:00
49998b5f72
[FIX] account: correctly handle 'false' close_method
...
bzr revid: xmo@openerp.com-20121001075931-zyrmydt1s7uz7ihk
2012-10-01 09:59:31 +02:00
45ee8b434d
[FIX] account: incorrect check for parent_id value
...
would try a read on parent_id=False, which blows up
bzr revid: xmo@openerp.com-20121001071728-npq7ieoe3rpz44i7
2012-10-01 09:17:28 +02:00
2c0e250edc
[MERGE] better domain on CoA template
...
bzr revid: fp@tinyerp.com-20120930124654-jbi90s6v042ve8q8
2012-09-30 14:46:54 +02:00
6bae31462e
[MERGE] fix unicode problem on account
...
bzr revid: fp@tinyerp.com-20120929120724-lkvn8cp3z7116s33
2012-09-29 14:07:24 +02:00
135d96cafc
[MERGE] for spanish localisation
...
bzr revid: fp@tinyerp.com-20120929093737-984akfhrl6l5khk2
2012-09-29 11:37:37 +02:00
84a454c70a
[FIX] translate journal view
...
bzr revid: fp@tinyerp.com-20120929093616-ru0god6cd7vxu6qh
2012-09-29 11:36:16 +02:00
338bf45e3d
[FIX] Add Domain in parent_id and remove unnecessary code.
...
bzr revid: vba@tinyerp.com-20120928055852-utqbghq2e1we7r9g
2012-09-28 11:28:52 +05:30
1fbb4a5c16
[IMP] handling of '(copy)' l10n
...
bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3
2012-09-24 18:26:45 +02:00
5ffbf77067
[MERGE] fixes in account
...
bzr revid: fp@tinyerp.com-20120920092726-5747f5kj14u26sb1
2012-09-20 11:27:26 +02:00
e308d04d8e
[MERGE]
...
bzr revid: apa@tinyerp.com-20120917100306-20mykzfvurzr71wm
2012-09-17 15:33:06 +05:30
9e25673a45
[Merge] lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-customers-suppliers-journal-items-kbh
...
bzr revid: jam@tinyerp.com-20120914093805-jh2sjnb923h1mx9j
2012-09-14 15:08:05 +05:30
d7dfc3dc1c
[MERGE] lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120912044315-t7gtrwck9fc3h9vd
bzr revid: jam@tinyerp.com-20120913045246-iuvrqt992b60tekt
bzr revid: jam@tinyerp.com-20120914042725-jiagjctwti0vd68m
2012-09-14 09:57:25 +05:30
15b62537f5
[IMP] code cleaning
...
bzr revid: abo@openerp.com-20120913125228-mb17mk4m6dqbm5rt
2012-09-13 14:52:28 +02:00
2ef470f717
[FIX]account:fix the issue of customer/supplier journal items
...
bzr revid: kbh@tinyerp.com-20120913124136-ygcr1666kzmcm3bp
2012-09-13 18:11:36 +05:30
0986f13047
[FIX] recurring line's model form view
...
properly set a company id when a journal is selected and, therefore, correctly display available accounts
bzr revid: abo@openerp.com-20120913122312-v2zz8m4r8wcxovtx
2012-09-13 14:23:12 +02:00
b4441a1ca4
[IMP] account template loading speedup 1min on runbot
...
check parent_id type constraint before create/write
remove parent_id eval 0
bzr revid: al@openerp.com-20120912005721-ofpgkaorlm4zrwgy
2012-09-12 02:57:21 +02:00
6283d212e5
[MERGE] account: Fix a typo in the variable name
...
bzr revid: stw@openerp.com-20120910103747-f2ar7jj4w8az2dya
2012-09-10 12:37:47 +02:00
c17a459f03
Merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-removed-tch
...
bzr revid: jam@tinyerp.com-20120910063452-mwa7zq3f91t1ndnf
2012-09-10 12:04:52 +05:30
6c7cdd7712
Merge lp:openobject-addons
...
bzr revid: jam@tinyerp.com-20120910043039-vu4qn4t20je6ew8r
2012-09-10 10:00:39 +05:30
cbd5cff60c
[MERGE]merge with project barch main branch
...
bzr revid: tch@tinyerp.com-20120907073038-ezgc5cpmnost9zcm
2012-09-07 13:00:38 +05:30
ac75763855
[MRG] merge with lp:openobjec-addons.
...
bzr revid: tpa@tinyerp.com-20120907063657-l0eve7vwo9w3jij1
2012-09-07 12:06:57 +05:30
58fe30e520
[MERGE] stock: fix the issue of counting of Deliveries
...
[MERGE] account: fix the KeyError in the lines of journal.entry
bzr revid: stw@openerp.com-20120906145520-twnqeb3wyezarcnx
2012-09-06 16:55:20 +02:00
3f600062d3
[IMP]remove server warnings
...
bzr revid: tch@tinyerp.com-20120906132533-51shfwfgzguwufsl
2012-09-06 18:55:33 +05:30
6273941772
[MERGE] currency from company
...
bzr revid: fp@tinyerp.com-20120907134229-oblfauk8y435nwhz
2012-09-07 15:42:29 +02:00
2d89c39f89
[MERGE] account: If the credit or debit field does not exist in the journal entry line, return 0.0
...
bzr revid: stw@openerp.com-20120905130038-3lk43b0ftzoscobm
2012-09-05 15:00:38 +02:00
d155b77a04
[MERGE] account: remove the payement term lines if we remove the payment term
...
bzr revid: stw@openerp.com-20120904151837-cuwhc0iawvl32vh9
2012-09-04 17:18:37 +02:00
dfb82b2081
[MERGE] Merge from trunk.
...
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
1eac0fbe52
[REF] Replace the user id 1 by openerp.SUPERUSER_ID
...
bzr revid: stw@openerp.com-20120831135136-8k2wjeiixqt6tnkr
2012-08-31 15:51:36 +02:00
6104756d30
[MERGE] account: when generating objects from templates, set the default taxes as a super user + refactoring of deprecated set() method of ir.values
...
bzr revid: qdp-launchpad@openerp.com-20120831124141-yl4sq3ajrttvm81z
2012-08-31 14:41:41 +02:00
0cb8be90ab
[IMP] If ids are int or long then convert into list.
...
bzr revid: bth@tinyerp.com-20120831114125-z3rk36ip710u1czd
2012-08-31 17:11:25 +05:30
b5a8f42641
[MERGE] merge lp:~openerp-dev/openobject-addons/trunk-remove-warnings-server-installation-account-bth
...
bzr revid: bth@tinyerp.com-20120831113829-vkkmdexyyhoeh3zu
2012-08-31 17:08:29 +05:30
278ad45c38
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120830141006-u0ptli8ab49uhafl
2012-08-30 19:40:06 +05:30
77593dcc2a
[IMP] if not list then convert into list.
...
bzr revid: bth@tinyerp.com-20120829091107-ohpgyjikeaatrxd1
2012-08-29 14:41:07 +05:30
baad695095
[FIX] account: company isn't a kwarg for set_default. company_id is
...
bzr revid: qdp-launchpad@openerp.com-20120828112329-g5y9n2e18bvci9r5
2012-08-28 13:23:29 +02:00
768d9cdb7e
[IMP] account: Merge the opening_control and closing_control flags in cash_control
...
[IMP] account: In the case where the bank statement is a cash register, we can get the coins of the last register.
[IMP] account: Hide the 'Available Coins' if the journal hasn't the cash_control flag.
[FIX] account: Use some default values for the profit/loss and internal account.
[IMP] point_of_sale: Avoid to have two payment methods with the cash_control in a pos.config object.
[REF] point_of_sale: Refactor the computation code of the cash_journal, cash_register and cash_control flags.
[IMP] point_of_sale: Store the difference in the right account if the journal of the statement is a cash_control or nota.
[FIX] point_of_sale: Use the session name instead of the order name for the account.bank.statement.line .
[IMP] point_of_sale: [DEMO] Define the default payment_methods for the pos.config.
bzr revid: stw@openerp.com-20120828112116-lblikdcn92lcpc7w
2012-08-28 13:21:16 +02:00
0fb11f25c4
[FIX] account: when generating objects from templates, set the default taxes as a super user + use of set_default() instead of deprecated set(key='default') (on ir.values)
...
bzr revid: qdp-launchpad@openerp.com-20120828095345-erwdm59r3wspqbah
2012-08-28 11:53:45 +02:00
ae3970d9a3
Merge with latest addons.
...
bzr revid: amb@tinyerp.com-20120827130303-5d1w7r5dau6wj14g
2012-08-27 18:33:03 +05:30
f06f0da395
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120823130751-55j9naym9rab8492
bzr revid: pso@tinyerp.com-20120827053644-mzy2bj3fppc3ij4e
2012-08-27 11:06:44 +05:30
3e79640aaf
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120824083535-hvv8cex6d33hfh2o
2012-08-24 14:05:35 +05:30
afa60ebc74
[FIX] lp: 1039013, where an id is given to name_get instead of a list of ids
...
lp bug: https://launchpad.net/bugs/1039013 fixed
bzr revid: qdp-launchpad@openerp.com-20120823142656-nsqml3jnyylpgzxu
2012-08-23 16:26:56 +02:00
7fa9451428
[IMP] Added onchange on company to fetch currency related to it
...
bzr revid: pso@tinyerp.com-20120823095141-oc840e23y1sk1mjs
2012-08-23 15:21:41 +05:30
6bb1c6cc98
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20120823075233-qusrimwu903wdsmf
2012-08-23 13:22:33 +05:30
56177da6c5
[IMP] Improved default view and method of set accounting options wizard
...
bzr revid: pso@tinyerp.com-20120820073038-3dmkx96br61t9gd0
2012-08-20 13:00:38 +05:30
3a99e1b2cc
[MERGE]
...
bzr revid: hmo@tinyerp.com-20120809130639-vykbp1cqi02y66ct
2012-08-09 18:36:39 +05:30
4ae8ce4516
[MERGE]
...
bzr revid: stw@openerp.com-20120808140846-ay7qn0bymtdbwj9q
2012-08-08 16:08:46 +02:00
59aa37f0e4
[IMP] all the warning messages now start with 'Warning\!' (not 'Warning' or 'Warning \!')
...
bzr revid: abo@openerp.com-20120807113414-7mryqyt3jnq8shsa
2012-08-07 13:34:14 +02:00
b0e8ae4c7d
[IMP] error messages
...
fix errors ending with an exclamation point; use a point instead
remove uniques (or almost) error messages titles, like 'Encoding Error' (1 occurrence in addons), 'Integrity Error' (1 occurrence in addons), 'Report Name' (1 occurrence in addons), 'Value Error' (1 occurrence in addons), 'Wrong Period Code' (1 occurrence in addons); replace these with 'Error'
add newline character after some messages titles, when necessary
fix 'UserError': should be 'User Error'
remove spaces before exclamation marks
add capital letters to messages titles words (e.g.: 'Invalid action' becomes 'Invalid Action')
bzr revid: abo@openerp.com-20120807110616-u3nlnybtgaebro18
2012-08-07 13:06:16 +02:00
48e0915804
[IMP] rephrase some error and warning messages in account
...
remove exclamation marks at the end of messages
remove first person usage ('I' and 'We')
remove unjustified capital letters
rephrase the clumsy form 'No <some attribute> is defined'
bzr revid: abo@openerp.com-20120806154410-kbf9aai2uzq2b0c4
2012-08-06 17:44:10 +02:00
206252d606
[IMP] fix a first batch of typos and spelling mistakes (listed by UCO on the 2012-08-01)
...
bzr revid: abo@openerp.com-20120803172636-s23g6yturpb5chd6
2012-08-03 19:26:36 +02:00
c11754eaa9
Merge with addons-trunk revno 7150
...
Adapt views accordingly
bzr revid: alexis@via.ecp.fr-20120802134012-fjk20wld5rv9v45i
2012-08-02 15:40:12 +02:00
773c2d5c63
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
b411fa65d8
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120731104554-ku0mpomglio4jtjn
2012-07-31 16:15:54 +05:30
ad7c078757
[FIX] account : Fixed the unicode decode error on search of account.account object
...
lp bug: https://launchpad.net/bugs/1029316 fixed
bzr revid: amp@tinyerp.com-20120730093020-ujffkjldt1uuflip
2012-07-30 15:00:20 +05:30
3aacb89abf
[IMP] account: Improved default get method of account configuration wizard to set currency as default
...
bzr revid: pso@tinyerp.com-20120727094252-p56w0d3ko353sgdw
2012-07-27 15:12:52 +05:30
fe071b4816
[IMP]account : made c capital for Centralised Counterpart
...
bzr revid: cha@tinyerp.com-20120727084642-42ronls2600r2thk
2012-07-27 14:16:42 +05:30
962ab82207
[MERGE] fixed error in account.account.__compute(). Courtesy of Guewen Baconnier (Camptocamp)
...
bzr revid: qdp-launchpad@openerp.com-20120725192632-n5x1h25gugb2icue
2012-07-25 21:26:32 +02:00
0bc828b75e
[MERGE] account/account.py: use of tools.float_utils float_round() method instead of round(). lp: 977300
...
bzr revid: qdp-launchpad@openerp.com-20120725142836-mtts1wub192861pw
2012-07-25 16:28:36 +02:00
e5da0e191b
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Foram Katharotiya (OpenERP)
sgo@tinyerp.com
Paramjit Singh Sahota
Christophe Matthieu
Olivier Dony
Martin Trigaux
Amit Bhavsar (Open ERP)
Thibault Delavallée
Quentin (OpenERP)
Guewen Baconnier
Vishmita Jadeja (openerp)
ggh-openerp
Vo Minh Thu
Raphael Collet
Chris Biersbach
Ajay Chauhan (OpenERP)
csn-openerp
Rifakat
Randhir Mayatra (OpenERP)
Cecile Tonglet
Fabien Pinckaers
Antony Lesuisse
Atul Patel (OpenERP)
Nimesh (Open ERP)
pankita shah (Open ERP)
Jalpesh Patel (OpenERP)
Fabien Pinckaers
Alexis de Lattre
Michael Telahun Makonnen
Rajesh Prajapati (OpenERP)
Joël Grand-Guillaume
Mayur Maheshwari (OpenERP)
Xavier Morel
Antonin Bourguignon
Vijaykumar Baladaniya
Amit Patel
Jigar Amin - OpenERP
Khushboo Bhatt (Open ERP)
Stephane Wirtel
Twinkle Christian (OpenERP)
Turkesh Patel (Open ERP)
Jiten (OpenERP)
Bhumi Thakkar (Open ERP)
Harry (OpenERP)
pso (OpenERP)
Amit (OpenERP)