Christophe Simonis
bf29a2ebc7
[MERGE] forward port of branch 7.0 up to revid 9302 chs@openerp.com-20130718111616-apacuhc2qhquobtc
...
bzr revid: dle@openerp.com-20130627104833-b9zgtu8urj43f12b
bzr revid: mat@openerp.com-20130702135856-kmg7d8anw17nkbd8
bzr revid: chs@openerp.com-20130718115928-wpa84dqh8tcq31zt
2013-07-18 13:59:28 +02:00
Martin Trigaux
4910b5e654
[FIX] point_of_sale: don't group move lines if debit and credit
...
lp bug: https://launchpad.net/bugs/1127114 fixed
bzr revid: mat@openerp.com-20130626093412-or5k3eznjsxbvgu3
2013-06-26 11:34:12 +02:00
Christophe Simonis
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
Christophe Matthieu
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
Quentin (OpenERP)
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
Thibault Delavallée
efceba5b8b
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130416073641-pcelb6zsq8dg56wb
2013-04-16 09:36:41 +02:00
Thibault Delavallée
812c852fd0
[FORWARD] Merged 7.0 addons revisions until 9021
...
bzr revid: tde@openerp.com-20130415084302-hx7zxtpl5u6yphfg
bzr revid: tde@openerp.com-20130415153732-v4ols3t56rku92oz
2013-04-15 17:37:32 +02:00
Vo Minh Thu
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
Antony Lesuisse
354ac328c8
[FIX] point_of_sale fix tax rouding, this time tested, tnx fva
...
bzr revid: al@openerp.com-20130411224306-eei87tz4xp3d0o7n
2013-04-12 00:43:06 +02:00
Thibault Delavallée
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
Frédéric van der Essen
b2a872846c
[FIX] point_of_sale: use the correct rounding method for computing taxes
...
bzr revid: fva@openerp.com-20130409160021-707f3vrxcrqytsl6
2013-04-09 18:00:21 +02:00
Josse Colpaert
4bb06462d7
[FIX] Check that payment method journal is of type cash or bank
...
bzr revid: jco@openerp.com-20130405134438-86l1ph7192owwrol
2013-04-05 15:44:38 +02:00
Quentin (OpenERP)
c5cde2a6a3
[MERGE] fixes in POS: optimizing the code when closing a session to have acceptable delays, used the right partner, changing the partner on the pos order also change it on the payment linked...
...
bzr revid: qdp-launchpad@openerp.com-20130404151428-yr2jhgjkolyjrcyf
2013-04-04 17:14:28 +02:00
Raphael Collet
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
Josse Colpaert
78e9418717
[FIX] Write all lines at once to the move instead of creating move lines separately
...
bzr revid: jco@openerp.com-20130328155549-pdqg0fgk1timzgfb
2013-03-28 16:55:49 +01:00
Josse Colpaert
c0b4f5b714
[FIX] taxes should have partner too
...
bzr revid: jco@openerp.com-20130328121615-eyoplrrrofrosuay
2013-03-28 13:16:15 +01:00
Josse Colpaert
2d210fce44
[FIX] Use accounting partner and take partner into account when group by
...
bzr revid: jco@openerp.com-20130328112829-6sj9eixmkzm3dr1r
2013-03-28 12:28:29 +01:00
Josse Colpaert
fb38f1d81d
[FIX] Update partner in associated bank statements when changing partner in pos order
...
bzr revid: jco@openerp.com-20130325134410-ky0akwdcfr805df8
2013-03-25 14:44:10 +01:00
Thibault Delavallée
40a5dda617
[MERGE] Forward port of addons until 8903
...
bzr revid: tde@openerp.com-20130321093716-3nt7h2xunl8lusqh
2013-03-21 10:37:16 +01:00
Cedric Snauwaert
87908c8b58
[FIX]pos: fix error when trying to duplicate point of sale
...
bzr revid: csn@openerp.com-20130318105304-3g7qlb8lrjr0e5rw
2013-03-18 11:53:04 +01:00
Quentin (OpenERP)
be05b374a1
[MERGE] forwardport of bugfixes made in v7 up to revision 8854.
...
bzr revid: qdp-launchpad@openerp.com-20130314112740-s01t51p4m7mxcumz
2013-03-14 12:27:40 +01:00
Stephane Wirtel
089214b0f2
[FIX] point_of_sale: add the missing call to the workflow service
...
bzr revid: stw@openerp.com-20130308110449-feobq8yoc6kg3efy
2013-03-08 12:04:49 +01:00
Quentin (OpenERP)
e2576590e3
[MERGE] point_of_sale: acconting entries generation failed if a tax was defined with no account for tax collected.
...
this hack is pretty stupid, don't mention it. We need to refactor the whole function, the sooner the better. At least it's not worst than before as we were already using 'line' without being sure it was defined (and now, with the assert, we are)
bzr revid: qdp-launchpad@openerp.com-20130306174616-rb5sr2a6wv8nef3v
2013-03-06 18:46:16 +01:00
Cedric Snauwaert
7577488134
[FIX]point of sale: when creating account_move_line, was passing a false parameter instead of a correct account id
...
bzr revid: csn@openerp.com-20130306155548-pdeli8m5ao3126aw
2013-03-06 16:55:48 +01:00
Xavier ALT
41ea6e7ccd
[TEST] add unit test to ensure POS only considere product taxes from current session's company
...
bzr revid: xal@openerp.com-20130227104505-9ndnub6zs8sjfhzj
2013-02-27 11:45:05 +01:00
Raphael Collet
6bd409246d
[IMP] remove model methods _workflow_trigger and _workflow_signal, and replace calls to new workflow methods
...
bzr revid: rco@openerp.com-20130213140052-9q6s9m3x6ye0qy35
2013-02-13 15:00:52 +01:00
Raphael Collet
5f855a1ddb
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20130213083519-3nbg40h5em0gfeu3
2013-02-13 09:35:19 +01:00
Tejas Tank
9b8d7de0ac
[IMP] Workflow api changes: [account_payment, account_voucher, hr_holidays, hr_payroll, hr_timesheet_sheet, l10n_in_hr_payroll, point_of_sale, procurement, purchase, sale, sale_stock].
...
bzr revid: tta@openerp.com-20130204082943-vfevxeb7za6r4sy7
bzr revid: tta@openerp.com-20130204112949-07l1v3ru215iglut
2013-02-04 16:59:49 +05:30
Ajay Chauhan (OpenERP)
85f6cb8239
[IMP] POS: made some changes in code
...
bzr revid: cha@tinyerp.com-20130204064142-xivaomscssibwsb8
2013-02-04 12:11:42 +05:30
Ajay Chauhan (OpenERP)
3589c008ad
[IMP] POS: use the new signal_xxx methods instead of trg_validate.
...
bzr revid: cha@tinyerp.com-20130201062421-luknla6wp3yqxhqm
2013-02-01 11:54:21 +05:30
Frédéric van der Essen
2e3adb48c4
[FIX] point_of_sale: taxes behaviour in invoice generation from pos orders matches the sale order behaviour
...
bzr revid: fva@openerp.com-20130128143641-51vssmkvxbxcprvn
2013-01-28 15:36:41 +01:00
Hardik Ansodariya
4074305819
[FIXED] point_of_Sale:point_of_Sale: Fixed the issue of taxes in multicompany enviorment (Maintenance case: 583541)
...
bzr revid: han@tinyerp.com-20130122125656-c8sjw65gsb363jy5
2013-01-22 18:26:56 +05:30
Vo Minh Thu
e7f4891d46
[IMP] use the openerp namespace.
...
bzr revid: vmt@openerp.com-20121206145632-0h1coh5aaem65wsy
2012-12-06 15:56:32 +01:00
Fabien Pinckaers
9c66d7d2f9
[IMP] PoS Useability
...
bzr revid: fp@tinyerp.com-20121126121350-1n3v1nqsrjf8b5qf
2012-11-26 13:13:50 +01:00
Frédéric van der Essen
4d90fdd32e
[IMP] point_of_sale: you must now use available_in_pos to make product available in pos ... Products without categories will appear at the root category
...
bzr revid: fva@openerp.com-20121122175254-ippyf1rstggvvwh7
2012-11-22 18:52:54 +01:00
Sanjay Gohel (Open ERP)
35d3d481f7
[IMP]change typo
...
bzr revid: sgo@tinyerp.com-20121106071724-jwd7c75rk382yuzf
2012-11-06 12:47:24 +05:30
Sanjay Gohel (Open ERP)
bfb7746b6b
[IMP]stock picking name set on create picking
...
bzr revid: sgo@tinyerp.com-20121106071116-nki3vftl249l2hes
2012-11-06 12:41:16 +05:30
Sanjay Gohel (Open ERP)
b74fe87f94
[IMP]ser pricelist of pos on pos order
...
bzr revid: sgo@tinyerp.com-20121106061302-m00bezd0bt0line7
2012-11-06 11:43:02 +05:30
Fabien Pinckaers
974ca267cf
[MERGE] fix multi-company for pos
...
bzr revid: fp@openerp.com-20121103172128-rx5lvo5xzmsj9ay1
2012-11-03 18:21:28 +01:00
Fabien Pinckaers
74476c8e22
[FIX] POS close session without cash register
...
bzr revid: fp@openerp.com-20121103171225-nlp53s0aenamdhcg
2012-11-03 18:12:25 +01:00
Fabien Pinckaers
ce874db95a
[FIX] POS
...
bzr revid: fp@openerp.com-20121103152504-f3o6ce0e833hdibj
2012-11-03 16:25:04 +01:00
Fabien Pinckaers
cd68364301
[MERGE] English typos
...
bzr revid: fp@openerp.com-20121102173407-umicel4287htim14
2012-11-02 18:34:07 +01:00
Vijaykumar Baladaniya
1fc8b2e611
[IMP]Improve tool tip.
...
bzr revid: vba@tinyerp.com-20121031072758-niyxbgdzih79mln1
2012-10-31 12:57:58 +05:30
Vijaykumar Baladaniya
510be6595c
Improve tooltip.
...
bzr revid: vba@tinyerp.com-20121030131401-hf7oonmt0nkwfi1y
2012-10-30 18:44:01 +05:30
Vijaykumar Baladaniya
de55e6d736
[MERGE]merge with trunk-terminology_batch2.
...
bzr revid: vba@tinyerp.com-20121029055922-pmwrqgxq8yo3qb20
2012-10-29 11:29:22 +05:30
Amit Patel
0bf0b95d67
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121029051732-hcgpnra148041ews
2012-10-29 10:47:32 +05:30
Vijaykumar Baladaniya
7850a91339
[IMP]Improve a tooltip.
...
bzr revid: vba@tinyerp.com-20121023130242-pu2o7e9x7lpr7g36
2012-10-23 18:32:42 +05:30
Sanjay Gohel (Open ERP)
f30d1585e5
[IMP]set pos company in statment create
...
bzr revid: sgo@tinyerp.com-20121018125506-lrdsyklk0oap2u5z
2012-10-18 18:25:06 +05:30
Mayur Maheshwari (OpenERP)
0b87880029
[IMP]all: imporve string state to status
...
bzr revid: mma@tinyerp.com-20121012114258-w2q3hg1wb5wlt8wi
2012-10-12 17:12:58 +05:30
Amit Patel
2762e94eb3
[MERGE]:trunk
...
bzr revid: apa@tinyerp.com-20121011052218-dx74aeg04h6azdmz
bzr revid: apa@tinyerp.com-20121012050113-w3b9fijrbxfyndxj
2012-10-12 10:31:13 +05:30