Jiten (OpenERP)
5930fd069f
[MERGE] Merged trunk.
...
bzr revid: jra@tinyerp.com-20120904102700-8f94o2dvdt0f33bv
2012-09-04 15:57:00 +05:30
Stephane Wirtel
42ae38116a
[MERGE] point_of_sale: Improve the layout of the pos.session.opening wizard.
...
bzr revid: stw@openerp.com-20120904100711-rp4ca0u9hs0t7vm4
2012-09-04 12:07:11 +02:00
Thibault Delavallée
48c081f271
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120904075142-4xnbxyf52ph0jezj
2012-09-04 09:51:42 +02:00
Fabien Pinckaers
74e4fe0f53
[MERGE] USablity improvements: product form/kanban/search, membership, projects
...
bzr revid: fp@tinyerp.com-20120903175638-lq221k6yjyams8kn
2012-09-03 19:56:38 +02:00
Frédéric van der Essen
d66519fda2
[FIX] point_of_sale: I should have tested this more
...
bzr revid: fva@openerp.com-20120903145958-c7i93lp8q8w8ilop
2012-09-03 16:59:58 +02:00
Frédéric van der Essen
e0d5b6ac8b
[IMP] point_of_sale: fetch is now a method
...
bzr revid: fva@openerp.com-20120903144354-8563uwq7x0cvqvrp
2012-09-03 16:43:54 +02:00
Frédéric van der Essen
f8212984f3
[IMP] point_of_sale: moved data loading to it's own method for easier extension dev
...
bzr revid: fva@openerp.com-20120903142527-iv0d97a0tzbjyo6o
2012-09-03 16:25:27 +02:00
Stephane Wirtel
b832115057
[FIX] point_of_sale: Return the state of the session in the wizard
...
bzr revid: stw@openerp.com-20120903134533-lqyay7rv7jkusde8
2012-09-03 15:45:33 +02:00
Frédéric van der Essen
2c3b3a0bd1
[IMP] point_of_sale: adding a description field to the products
...
bzr revid: fva@openerp.com-20120903133239-hai1o87yrpxvbaic
2012-09-03 15:32:39 +02:00
Stephane Wirtel
d5459171bd
[FIX] point_of_sale: Show the Opening and Closing balance only if the session is closed
...
bzr revid: stw@openerp.com-20120903125740-xxl4x298imiyo0y9
2012-09-03 14:57:40 +02:00
Frédéric van der Essen
6040787bb0
[FIX] point_of_sale: forgot to add the nohover css file
...
bzr revid: fva@openerp.com-20120903124838-gmn4wsjrbqnhbi9m
2012-09-03 14:48:38 +02:00
Frédéric van der Essen
81115666a1
[IMP] point_of_sale: only sell products that can be sold ...
...
bzr revid: fva@openerp.com-20120903122649-etypfgvdjo3s8p0s
2012-09-03 14:26:49 +02:00
Frédéric van der Essen
716651c27d
[IMP] point_of_sale: alternative css without hover effects for resistive screens
...
bzr revid: fva@openerp.com-20120903115954-t26j8qx54a6o9pta
2012-09-03 13:59:54 +02:00
Tejas Tank
f39f799897
Fix: Account configuration : removed currency group.
...
bzr revid: tta@openerp.com-20120903095908-tswt6gi2zl5w89s2
2012-09-03 15:29:08 +05:30
Frédéric van der Essen
a77587e064
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120903094840-vd63m4i8vkqxjij2
2012-09-03 11:48:40 +02:00
Thibault Delavallée
6fa349a4eb
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120903091818-0qnjl3e5tss54bbj
2012-09-03 11:18:18 +02:00
Jiten (OpenERP)
dfb82b2081
[MERGE] Merge from trunk.
...
bzr revid: jra@tinyerp.com-20120903065444-bcadcpsnadx0vhpx
2012-09-03 12:24:44 +05:30
Launchpad Translations on behalf of openerp
e3f1c26e6a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120901045519-l6nqaovtdathorsj
bzr revid: launchpad_translations_on_behalf_of_openerp-20120903052117-yz3n1mkbu0qpbnfo
2012-09-03 05:21:17 +00:00
Fabien Pinckaers
7ebf462e07
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831174746-7bfitkd45m73r6oz
2012-08-31 19:47:46 +02:00
Cecile Tonglet
4785fc109e
[FIX] Point of Sales Users Demo
...
bzr revid: cto@openerp.com-20120831170747-iyptvo6iy96d12w4
2012-08-31 19:07:47 +02:00
Fabien Pinckaers
33897328bc
[IMP] product view
...
bzr revid: fp@tinyerp.com-20120831164018-b8m7xhxi2na5eraj
2012-08-31 18:40:18 +02:00
Fabien Pinckaers
349c24a1cd
[IMP] usability
...
bzr revid: fp@tinyerp.com-20120831163517-vqatk8mzl7u2vuym
2012-08-31 18:35:17 +02:00
Fabien Pinckaers
6eb0b6af71
fix
...
bzr revid: fp@tinyerp.com-20120831162831-qn2ai0258pki7fxp
2012-08-31 18:28:31 +02:00
Frédéric van der Essen
9cfe5665a5
[DONE] point_of_sale: disable validation button when order not fully paid
...
bzr revid: fva@openerp.com-20120831145606-nrk44gs60lab4k3l
2012-08-31 16:56:06 +02:00
Frédéric van der Essen
b3ec8d7647
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120831143222-j86sa4w0vuy24z7j
2012-08-31 16:32:22 +02:00
Frédéric van der Essen
846ec67adc
[WIP] point_of_sale: disable validation button when order not fully paid
...
bzr revid: fva@openerp.com-20120831143159-a64527c3a1a8chk0
2012-08-31 16:31:59 +02:00
Stephane Wirtel
bf513b5919
[IMP] point_of_sale: Add a description when the session is in progress
...
bzr revid: stw@openerp.com-20120831102509-yv3bc68gii0sexfk
2012-08-31 12:25:09 +02:00
Jiten (OpenERP)
2e664de4f8
[IMP] Improved code to remove warning(server log) for deprecated type.
...
bzr revid: jra@tinyerp.com-20120831101659-voh9g3kwmhji2bf1
2012-08-31 15:46:59 +05:30
Thibault Delavallée
c14a11482c
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120831074032-3b41p3qnuknfv461
2012-08-31 09:40:32 +02:00
Olivier Dony
1dce0b1dc4
[FIX] all mail dependencies: replace message_post call by normal record + review misc wording
...
bzr revid: odo@openerp.com-20120830141852-ku8nql1sfkko8669
2012-08-30 16:18:52 +02:00
Stephane Wirtel
54237bc2a2
[MERGE] point_of_sale: Add some improvements and bug fixes
...
bzr revid: stw@openerp.com-20120830132642-o9ish51w0s7aigzn
2012-08-30 15:26:42 +02:00
Stephane Wirtel
7d120eb1d1
[FIX] point_of_sale: Set the right balance end for a bank statement
...
[FIX] point_of_sale: Show/Hide some tabs
bzr revid: stw@openerp.com-20120829154634-ko3v2bi6oephr04e
2012-08-29 17:46:34 +02:00
Frédéric van der Essen
93395ac1ec
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120829125759-mjulntnmsyjzs0xq
2012-08-29 14:57:59 +02:00
Frédéric van der Essen
1eedcaedad
[IMP] point_of_sale: TODO changes
...
bzr revid: fva@openerp.com-20120829125640-5bml13zupja3w30b
2012-08-29 14:56:40 +02:00
Stephane Wirtel
6aded504b3
[FIX] point_of_sale: redefine the copy function for the pos.config to avoid a copy of the sequence.
...
[IMP] point_of_sale: Associate a default category for the existing products.
bzr revid: stw@openerp.com-20120829122501-xta26dk5bbav36zz
2012-08-29 14:25:01 +02:00
Dharti Ratani (OpenERP)
0e14e8dc20
[MERGE]Merged with latest trunk
...
bzr revid: dhr@tinyerp.com-20120829102402-3sdf5i8rfgq9dxca
2012-08-29 15:54:02 +05:30
Fabien Pinckaers
d3bb4f5ae5
merge
...
bzr revid: fp@tinyerp.com-20120829094828-b8pxz76tfnigfffw
2012-08-29 11:48:28 +02:00
Thibault Delavallée
8b910c1f1d
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120829074244-x6u8dnw4owiw93pv
2012-08-29 09:42:44 +02:00
Dharti Ratani (OpenERP)
6086951935
[MERGE]Merged with trunk
...
bzr revid: dhr@tinyerp.com-20120829061429-yko2f9xgqsyynvig
2012-08-29 11:44:29 +05:30
Stephane Wirtel
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
Dharti Ratani (OpenERP)
3733972565
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120828092928-da2a6k1f2e7g9i42
2012-08-28 14:59:28 +05:30
Launchpad Translations on behalf of openerp
4e31d1be93
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828064335-bftlutj6aiymztbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20120828072410-7ndsu3tnyrjhtuor
2012-08-28 07:24:10 +00:00
Dharti Ratani (OpenERP)
c2a8adb976
[IMP]pos,product(pricelist) and hr_expense_report : applying multi_currency group to currency field
...
bzr revid: dhr@tinyerp.com-20120828070841-l318wc2b4jkm99dz
2012-08-28 12:38:41 +05:30
Thibault Delavallée
4b0d1be1c0
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120827083705-p2edynkzch7hszrd
2012-08-27 10:37:05 +02:00
niv-openerp
65f532e001
[IMP] made a whole-application replace of $element by $el
...
bzr revid: nicolas.vanhoren@openerp.com-20120824182743-1d9cii7kigc7exer
2012-08-24 20:27:43 +02:00
Stephane Wirtel
45cf233538
[FIX] point_of_sale: Hide the has_XXX_control fields in the session
...
bzr revid: stw@openerp.com-20120824130730-8dqrjjqr7z1stwl5
2012-08-24 15:07:30 +02:00
Stephane Wirtel
ec6bd9c649
[FIX] point_of_sale: Review the buttons for the pos.session object
...
bzr revid: stw@openerp.com-20120824114300-jdax2175w9mbcb2n
2012-08-24 13:43:00 +02:00
Bhumi Thakkar (Open ERP)
de6d26886a
[IMP] Remove type field from ir.ui.view model.
...
bzr revid: bth@tinyerp.com-20120823125311-nx4x46ea3g2ercl8
2012-08-23 18:23:11 +05:30
Dharti Ratani (OpenERP)
00139302a7
[MERGE]merged with trunk
...
bzr revid: dhr@tinyerp.com-20120823072017-c48q59mif39j55wm
2012-08-23 12:50:17 +05:30
Dharti Ratani (OpenERP)
39ac8404ff
[IMP]Tax fix related to stock and pos
...
bzr revid: dhr@tinyerp.com-20120823071044-aonyui4dq2li8xnj
2012-08-23 12:40:44 +05:30
Dharti Ratani (OpenERP)
73025425f0
[IMP]Tax related changes in mrp and pos
...
bzr revid: dhr@tinyerp.com-20120823051120-en7wvauuwgop2w26
2012-08-23 10:41:20 +05:30
Antonin Bourguignon
121b351b59
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120822175756-ypym270e6cklpbds
2012-08-22 19:57:56 +02:00
Quentin (OpenERP)
a0679e6e4f
[MERGE] demo data branch
...
bzr revid: qdp-launchpad@openerp.com-20120822160856-k308a270wx2wnsj6
2012-08-22 18:08:56 +02:00
Fabien Pinckaers
e30fed20b8
merge_trunk
...
bzr revid: fp@tinyerp.com-20120822133742-yx81c62bux28wruy
2012-08-22 15:37:42 +02:00
Dharti Ratani (OpenERP)
1dd5177e11
[IMP]
...
bzr revid: dhr@tinyerp.com-20120822133428-24wti3kz7lh469jh
2012-08-22 19:04:28 +05:30
Saurang Suthar(OpenERP)
095843797c
[IMP] Improved _openerp__.py of all modules by replacing demo_xml with demo, init_xml and update_xml with data and adding noupdate
...
bzr revid: pso@tinyerp.com-20120822130232-un52dks3sclyx8m5
2012-08-22 18:32:32 +05:30
Stephane Wirtel
197e673100
[IMP] point_of_sale: improve the layout of 'your session'
...
bzr revid: stw@openerp.com-20120821150612-4ikdil8vzmkc0wwz
2012-08-21 17:06:12 +02:00
Dharti Ratani (OpenERP)
3ecb0798a3
[IMP]Fixing inherit id issues related to procurement and location changes
...
bzr revid: dhr@tinyerp.com-20120821124241-mibvnmuxby5xuzsv
2012-08-21 18:12:41 +05:30
Frédéric van der Essen
0d930ba843
[MERGE] from stw
...
bzr revid: fva@openerp.com-20120821121123-ingbtoedurmt6h48
2012-08-21 14:11:23 +02:00
Frédéric van der Essen
2e4d656dcb
[IMP] point_of_sale: removed useless settings, Wubbit Twarks
...
bzr revid: fva@openerp.com-20120821104814-wuxk1qptj7xqr1i9
2012-08-21 12:48:14 +02:00
Frédéric van der Essen
23de15d82b
[IMP] point_of_sale: simpler way to load models
...
bzr revid: fva@openerp.com-20120821100452-zop43cmqyxq0del0
2012-08-21 12:04:52 +02:00
Stephane Wirtel
bc1f8e6d4b
[IMP] point_of_sale: improve the layout of the pos.order
...
bzr revid: stw@openerp.com-20120821084857-4ieoknwcsivdooa1
2012-08-21 10:48:57 +02:00
Stephane Wirtel
28c036aef0
[FIX] point_of_sale: A manager can create a ir.sequence for the pos.config
...
bzr revid: stw@openerp.com-20120821083828-as5sqvatvvseaj9d
2012-08-21 10:38:28 +02:00
Stephane Wirtel
c803243a38
[FIX] point_of_sale: remove an useless test
...
bzr revid: stw@openerp.com-20120821082356-dr4vdka5u796ho9w
2012-08-21 10:23:56 +02:00
Stephane Wirtel
ca93a52e64
[FIX] point_of_sale: fix a report
...
bzr revid: stw@openerp.com-20120821082343-mu1p8231c4wa0kjm
2012-08-21 10:23:43 +02:00
Frédéric van der Essen
b3cecb2162
[IMP] point_of_sale: renamed the js files
...
bzr revid: fva@openerp.com-20120821075434-dy4oqwuok39i4eyj
2012-08-21 09:54:34 +02:00
Frédéric van der Essen
8d052c96bc
[FIX] point_of_sale: added contact_address to print info, empty order styling
...
bzr revid: fva@openerp.com-20120820135957-o5exttxak611e624
2012-08-20 15:59:57 +02:00
Hardik
8f9f860323
[IMP]Update __openerp__.py for all modules
...
bzr revid: hsa@tinyerp.com-20120820125644-px287o03bxrx8h3o
2012-08-20 18:26:44 +05:30
Frédéric van der Essen
c447533f7d
[FIX] point_of_sale: fix css for receipt printing
...
bzr revid: fva@openerp.com-20120820124007-fg36abyblxpboiyi
2012-08-20 14:40:07 +02:00
Frédéric van der Essen
b29c4a6113
[IMP] point_of_sale: improved receipt screen
...
bzr revid: fva@openerp.com-20120820102401-t5zkmh2hoamba719
2012-08-20 12:24:01 +02:00
Frédéric van der Essen
d0f762ab1f
[IMP] point_of_sale: more todos
...
bzr revid: fva@openerp.com-20120820093010-a2ymlgaa6z5ku53o
2012-08-20 11:30:10 +02:00
Frédéric van der Essen
185c82348c
[IMP] point_of_sale: todos
...
bzr revid: fva@openerp.com-20120820071327-wfbd7g5wbh5zrnaa
2012-08-20 09:13:27 +02:00
Frédéric van der Essen
69578a30c2
[MERGE] from stw
...
bzr revid: fva@openerp.com-20120817154315-yj19b39s2693apze
2012-08-17 17:43:15 +02:00
Frédéric van der Essen
da93d8b440
[IMP] point_of_sale: all images are app-cached now
...
bzr revid: fva@openerp.com-20120817154248-z86i0a838wd9ul92
2012-08-17 17:42:48 +02:00
Stephane Wirtel
62ffc54bf2
[MERGE] improve the point of sale
...
bzr revid: stw@openerp.com-20120817151933-ztflsr992l8ixze8
2012-08-17 17:19:33 +02:00
Stephane Wirtel
890371d982
[IMP] point_of_sale: fix some typo
...
[FIX] point_of_sale: add some groups
bzr revid: stw@openerp.com-20120817151529-1kkm9m5g5ob291ur
2012-08-17 17:15:29 +02:00
Stephane Wirtel
4230baf35a
[FIX] point_of_sale: set the 'False' value to opening_control and closing_control
...
bzr revid: stw@openerp.com-20120817143134-v9vjzvgh5kddeduc
2012-08-17 16:31:34 +02:00
Stephane Wirtel
211a9d0904
[FIX] point_of_sale: Typo
...
bzr revid: stw@openerp.com-20120817142838-rc2zu2xa57xoty7f
2012-08-17 16:28:38 +02:00
Frédéric van der Essen
e47792d9bf
[IMP] point_of_sale: category pictures are back and cached
...
bzr revid: fva@openerp.com-20120817142415-3k9cdc1mc68n8shk
2012-08-17 16:24:15 +02:00
Fabien Pinckaers
6ac583c0f7
[IMP] mail cleaning
...
bzr revid: fp@tinyerp.com-20120817111936-2d33nlqlbvkjb374
2012-08-17 13:19:36 +02:00
Hardik
b040d2706d
[IMP]update __openerp__.py in all modules
...
bzr revid: hsa@tinyerp.com-20120817111540-rfql0ifsvbx5nz7g
2012-08-17 16:45:40 +05:30
Fabien Pinckaers
66ece041f0
[IMP] append note
...
bzr revid: fp@tinyerp.com-20120817102650-1sglq1y2dbb3xqju
2012-08-17 12:26:50 +02:00
Frédéric van der Essen
adc76215ef
[FIX] point_of_sale: connection is now session. Removed console.log
...
bzr revid: fva@openerp.com-20120816163251-6nds8dmlcz8mz30v
2012-08-16 18:32:51 +02:00
Frédéric van der Essen
36b8744644
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120816162407-w35dzm3xqkxj8jry
2012-08-16 18:24:07 +02:00
Frédéric van der Essen
715e52130f
[IMP] point_of_sale: removed websql option from backend
...
bzr revid: fva@openerp.com-20120816160455-25gz0qb7kh0t3nfs
2012-08-16 18:04:55 +02:00
Frédéric van der Essen
15261610fb
[IMP] point_of_sale: removed websql option from client
...
bzr revid: fva@openerp.com-20120816160120-v27xcczg3be31pnz
2012-08-16 18:01:20 +02:00
Frédéric van der Essen
b3bcd4eabc
[FIX] point_of_sale: fixed some bugs with the scanner
...
bzr revid: fva@openerp.com-20120816155801-oexzurmsgfiv2xt9
2012-08-16 17:58:01 +02:00
Frédéric van der Essen
daba4e4fc2
[IMP] point_of_sale: ImageCache and RegExp search
...
bzr revid: fva@openerp.com-20120816150213-mdctwsjxiyjh4lxi
2012-08-16 17:02:13 +02:00
Rucha (Open ERP)
7a24bdb1f7
[FIX]: Improved old product names with new
...
bzr revid: rpa@tinyerp.com-20120816084224-t12wf5vipd8u90a7
2012-08-16 14:12:24 +05:30
Atul Patel (OpenERP)
f35c0b3d44
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814161000-41ai95ixagtqteok
2012-08-14 21:40:00 +05:30
Frédéric van der Essen
0e31e74b40
[FIX] point_of_sale: forgot to remove a ref to the DAO
...
bzr revid: fva@openerp.com-20120814153905-zlxpitgrhizt68zt
2012-08-14 17:39:05 +02:00
Christophe Simonis
c5dc5cef00
[IMP] sed -i '' -e 's/connection/session/g'
...
bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
2012-08-14 17:30:53 +02:00
Frédéric van der Essen
5a3dc89e7c
[IMP] point_of_sale: DAO removed, db used for orders instead. Don't stop sending orders on single failure
...
bzr revid: fva@openerp.com-20120814152112-vmitvbajx3r2mdeh
2012-08-14 17:21:12 +02:00
Vo Minh Thu
2376fe0add
[MERGE] merged view changes: the `type` is now a functional field derived from the arch.
...
bzr revid: vmt@openerp.com-20120814121117-dent4ctz89kdcabi
2012-08-14 14:11:17 +02:00
Frédéric van der Essen
36ea689ad9
[MERGE] html5 amnifest
...
bzr revid: fva@openerp.com-20120814120052-s9avcsbsxl06zewr
2012-08-14 14:00:52 +02:00
Frédéric van der Essen
7559c2e771
[WIP] point_of_sale: moving DAO to db
...
bzr revid: fva@openerp.com-20120814115630-23cv9s71zh79xcve
2012-08-14 13:56:30 +02:00
Atul Patel (OpenERP)
652300eb89
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814061700-k4swskeiz9r3ypn5
2012-08-14 11:47:00 +05:30
Antony Lesuisse
643b6cfc36
[FIX] image urls and NETWORK section
...
bzr revid: al@openerp.com-20120813223032-t6nouzthq43xr841
2012-08-14 00:30:32 +02:00
Antony Lesuisse
8d97d9830d
[FIX] remove unused or duplicate files
...
bzr revid: al@openerp.com-20120813221645-s8n8du7fy2sqhl0g
2012-08-14 00:16:45 +02:00
Antony Lesuisse
8627aa0b28
[IMP] point_of_sale add html5 manifest on /pos/app
...
bzr revid: al@openerp.com-20120813221601-gfvwiwii6s1b785d
2012-08-14 00:16:01 +02:00
Thibault Delavallée
8d2c35cc75
[IMP] Misc addons: product_image -> image.
...
bzr revid: tde@openerp.com-20120814081616-zb5xe06cy8r3n5ie
2012-08-14 10:16:16 +02:00
Vo Minh Thu
9822629548
[MERGE] merged trunk.
...
bzr revid: vmt@openerp.com-20120813160657-ilujdek8ys4fzhp9
2012-08-13 18:06:57 +02:00
Frédéric van der Essen
48062d4cf1
[IMP] point_of_sale: removed IndexeDB and asynchronous backend
...
bzr revid: fva@openerp.com-20120813160026-04w28p3pojzvdlkj
2012-08-13 18:00:26 +02:00
Frédéric van der Essen
b6c254942a
[FIX] point_of_sale: images are working now
...
bzr revid: fva@openerp.com-20120813144355-vgojt7llli8u9vye
2012-08-13 16:43:55 +02:00
Frédéric van der Essen
01cb3ebb99
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120813124439-izug22kl0plts08x
2012-08-13 14:44:39 +02:00
Frédéric van der Essen
4c3e048d40
[MERGE WIP] merging from trunk. Still some issues with the thumbnails
...
bzr revid: fva@openerp.com-20120813120801-gjufnck0f78ddivg
2012-08-13 14:08:01 +02:00
Rucha (Open ERP)
98e591c2a7
[IMP]: point_of_sale: Improved remaining product name translation
...
bzr revid: rpa@tinyerp.com-20120813071720-kcsjouksbz4v0act
2012-08-13 12:47:20 +05:30
Atul Patel (OpenERP)
7a1a9460d9
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120813051748-klau4w0nig2apfxb
2012-08-13 10:47:48 +05:30
Rucha (Open ERP)
dd7a2972d8
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120813051411-5no0xcudwbkw07c5
2012-08-13 10:44:11 +05:30
Fabien Pinckaers
9bc2064028
[FIX] PoS import order from UI, return money
...
bzr revid: fp@openerp.com-20120811143309-pd44zfw6l67j7x7l
2012-08-11 16:33:09 +02:00
Fabien Pinckaers
c17b2443e7
[IMP] improved UI for PoS - mainly forms version=7.0
...
bzr revid: fp@openerp.com-20120811133406-jvso3qhmozmgnj3j
2012-08-11 15:34:06 +02:00
Antonin Bourguignon
72fdeea2d8
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120810153957-asszi74t9dxrzhx7
2012-08-10 17:39:57 +02:00
Olivier Dony
1f32ebdc7c
[FIX] pos: Fix runbot breakage: use new XML id for unreference_product + move to pos_data file
...
bzr revid: odo@openerp.com-20120810151204-t6c0wmiusf9un7gq
2012-08-10 17:12:04 +02:00
Frédéric van der Essen
8759e49b83
[FIX] point_of_sale: reverting changes on the pos's views
...
bzr revid: fva@openerp.com-20120810141930-3xkh9ny0splzrs75
2012-08-10 16:19:30 +02:00
Antonin Bourguignon
f2fd44d85b
[MERGE] latust trunk
...
bzr revid: abo@openerp.com-20120810140856-xl6sj3xu9t4bee6c
2012-08-10 16:08:56 +02:00
Frédéric van der Essen
760939d83f
[IMP] point_of_sale: IndexedDB: the LocalStorage DB is working now
...
bzr revid: fva@openerp.com-20120810135832-7xb3yq0r1p829nv1
2012-08-10 15:58:32 +02:00
Fabien Pinckaers
01dc1b218b
[IMP] help menutips for PoS
...
bzr revid: fp@tinyerp.com-20120810135548-w2cgv11ynu6l8n5l
2012-08-10 15:55:48 +02:00
Fabien Pinckaers
cf57a87d41
[IMP] point of sale backend, useability improvements
...
bzr revid: fp@tinyerp.com-20120810134517-tenqseu6otf0rdin
2012-08-10 15:45:17 +02:00
Fabien Pinckaers
9dd3e6476f
[IMP] PoS backend
...
bzr revid: fp@tinyerp.com-20120809212311-q2b86eww9ppvdv8s
2012-08-09 23:23:11 +02:00
Frédéric van der Essen
78d8b5d394
[WIP] point_of_sale: indexeddb : products and categories are no longer in memory
...
bzr revid: fva@openerp.com-20120809195555-oluxe7xe8k2ugcoi
2012-08-09 21:55:55 +02:00
Frédéric van der Essen
03b79a9832
[WIP] point_of_sale: much progress on the indexeddb backend
...
bzr revid: fva@openerp.com-20120809172113-ex3o5vyt4ckv4au6
2012-08-09 19:21:13 +02:00
Atul Patel (OpenERP)
1674c9add5
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120809165534-89dhvj3pi1obnn8q
2012-08-09 22:25:34 +05:30
Antonin Bourguignon
ee4fd16e94
[FIX] remove the option from the user_id fields
...
we want users to be openable !
also improve indentation and remove some useless whitespaces
bzr revid: abo@openerp.com-20120809163529-8adlpszt3n6lhszi
2012-08-09 18:35:29 +02:00
Antonin Bourguignon
24f6e09c45
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120809143919-qrn9nm5ut5vlm8hw
2012-08-09 16:39:19 +02:00
Rucha (Open ERP)
7739d0d69b
[IMP]: point_of_sale: Translated PoS product names in English
...
bzr revid: rpa@tinyerp.com-20120809125412-is3y1fpjyo01c5b1
2012-08-09 18:24:12 +05:30
Rucha (Open ERP)
c6d01a7754
[IMP]: point_of_sale: Translated PoS category name in English and added images for all categories
...
bzr revid: rpa@tinyerp.com-20120809125325-vt5cew4b6mgpjtga
2012-08-09 18:23:25 +05:30
Twinkle Christian (OpenERP)
46cbde1ec9
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809071034-vvqp0m3yp25pij7g
2012-08-09 12:40:34 +05:30
Twinkle Christian (OpenERP)
8df3f3477b
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809065633-9zivhonm3pt82rxu
2012-08-09 12:26:33 +05:30
Twinkle Christian (OpenERP)
fc1b1749a8
[IMP]Remove type field from the modules
...
bzr revid: tch@tinyerp.com-20120809060516-zgx3gdyv6wdshfyw
2012-08-09 11:35:16 +05:30
Olivier Dony
3fd9a77c83
[REVERT] Cancel PO Template changes from rev.2702 - to be fully re-generated before next release
...
We'll also attempt to replace the master strings in the
translated .po files before replacing the master strings,
to avoid losing translations just because of mere typo fixes.
bzr revid: odo@openerp.com-20120808144613-wtz50tcz5n7kvcza
2012-08-08 16:46:13 +02:00
Mayur Maheshwari (OpenERP)
ff612f9d02
[MERGE]: Merge with lp:openobject-addons
...
bzr revid: mma@tinyerp.com-20120808094005-o7v0l6u15ide75za
2012-08-08 15:10:05 +05:30
Antonin Bourguignon
4388ace499
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120808091048-hr1r4vn9milozexf
2012-08-08 11:10:48 +02:00
Rucha (Open ERP)
d597437dd7
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120808063503-ymsvwnerxakqbcbx
2012-08-08 12:05:03 +05:30
Frédéric van der Essen
dc8f543d17
[WIP] point_of_sale: indexeddb : compatible localstorage backend. + anthony's modifications to the views...
...
bzr revid: fva@openerp.com-20120807161844-hd7ioxipnc6794jf
2012-08-07 18:18:44 +02:00
Antonin Bourguignon
a97687a420
[MERGE] latest trunk
...
also replace the error message title 'Operation Not Permitted' by 'Invalid Action'
bzr revid: abo@openerp.com-20120807120451-zdrrecilfh82obhl
2012-08-07 14:04:51 +02:00
Antonin Bourguignon
8a64e7580a
[IMP] all the error messages now start with 'Error\!' (not 'Error' or 'Error \!')
...
bzr revid: abo@openerp.com-20120807113137-44vehm0mthqawlo3
2012-08-07 13:31:37 +02:00
Thibault Delavallée
023262e519
[IMP] product, hr, point of sale, mail_group: propagated function name change (now prefixed with image_) in image module.
...
bzr revid: tde@openerp.com-20120807111039-57cykhxurm2wj79k
2012-08-07 13:10:39 +02:00
Thibault Delavallée
6c4dda8441
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120807100920-mr0oc56qs2zntvu1
2012-08-07 12:09:20 +02:00
Launchpad Translations on behalf of openerp
3cfd65b43d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20120807053928-8131c98edycpivlb
2012-08-07 05:39:28 +00:00
Thibault Delavallée
c8c95d46f9
[IMP] product, hr, pos, mail_group: removed the onchange_image, updated used images and classes in views.
...
bzr revid: tde@openerp.com-20120806155354-sjkrmrffgb2ik4ba
2012-08-06 17:53:54 +02:00
Frédéric van der Essen
996183acf7
[WIP] point_of_sale: indexedDB backend
...
bzr revid: fva@openerp.com-20120806154054-1yubgy8o8wwlc5b8
2012-08-06 17:40:54 +02:00
Thibault Delavallée
a814343ab7
[MERGE] Mergede with addons/trunk.
...
bzr revid: tde@openerp.com-20120806124445-hym9imdiqgeot8fu
2012-08-06 14:44:45 +02:00
Mayur Maheshwari (OpenERP)
7c51b1811d
[FIX]all :set a no_open widget in this filed(country_id,state_id,title,context_id,timebox_id,user_id)
...
bzr revid: mma@tinyerp.com-20120806110307-nj7qipixr14puhub
2012-08-06 16:33:07 +05:30
pso (OpenERP)
389f8d6803
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120806094234-1b145yrjixy5yrsg
2012-08-06 15:12:34 +05:30
Rucha (Open ERP)
b7daa1fb31
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id
2012-08-06 10:39:52 +05:30
Fabien Pinckaers
0869066f99
[IMP] improved modules message at installation --> to be reviewed later
...
bzr revid: fp@openerp.com-20120805201322-y8ghspcb69wmb3ut
2012-08-05 22:13:22 +02:00
Fabien Pinckaers
7904580e60
[IMwP] open the right menu according to the installed application
...
bzr revid: fp@openerp.com-20120804215327-651jy6mn1w15x430
2012-08-04 23:53:27 +02:00
Fabien Pinckaers
ea52cfae17
[IMP] introducing new file type: html
...
bzr revid: fp@openerp.com-20120804143556-457q040g6q30x3fu
2012-08-04 16:35:56 +02:00
Fabien Pinckaers
b363b1f622
fix
...
bzr revid: fp@openerp.com-20120804135631-9qqfgcz9513qsyzp
2012-08-04 15:56:31 +02:00
Fabien Pinckaers
4e69bdd6fc
[IMP] improved menu tips - 10 firsts clicks
...
bzr revid: fp@openerp.com-20120804132136-2b18cfkwv0njsglj
2012-08-04 15:21:36 +02:00
Antonin Bourguignon
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
Antonin Bourguignon
b12e606e18
[MERGE] latest trunk
...
bzr revid: abo@openerp.com-20120803160951-4n7ckom9hyhgeio2
2012-08-03 18:09:51 +02:00
Thibault Delavallée
8a408f2ff3
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120803071454-ictuwjq0y3gri4f8
2012-08-03 09:14:54 +02:00
Frédéric van der Essen
7cf6da22cc
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120802141841-83t16vuslxyj13h8
2012-08-02 16:18:41 +02:00
Frédéric van der Essen
03a3533dc5
[WIP] point_of_sale: IndexedDB Backend
...
bzr revid: fva@openerp.com-20120802141801-hpjqwkwlooqdaddu
2012-08-02 16:18:01 +02:00
Stephane Wirtel
9df99e1ca5
[IMP] point_of_sale: Add a new rule for the pos.order object
...
bzr revid: stw@openerp.com-20120801125234-x85l39sx5ibdmuba
2012-08-01 14:52:34 +02:00
Rucha (Open ERP)
01bea180bb
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
pso (OpenERP)
773c2d5c63
[MERGE] Merge with main branch
...
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Quentin (OpenERP)
e1b50e304d
[MEGUEZ] merged the clean search view branch
...
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
Twinkle Christian (OpenERP)
cb1c6c08af
[IMP]Improve search view in all modules
...
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
Atul Patel (OpenERP)
4c69545f9f
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120731111323-78su11n8ogul241d
2012-07-31 16:43:23 +05:30
Frédéric van der Essen
7dabfe49ea
[FIX] point_of_sale: removing useless console.log
...
bzr revid: fva@openerp.com-20120730154228-5vabk5qyvjez9dgk
2012-07-30 17:42:28 +02:00
Frédéric van der Essen
ccf07028cf
[IMP] point_of_sale: various fixes and improvements
...
bzr revid: fva@openerp.com-20120730154143-kz57aldzo1yalfx9
2012-07-30 17:41:43 +02:00
Thibault Delavallée
81f6d43ee4
[CLEAN] images: cleaned typos.
...
bzr revid: tde@openerp.com-20120730133343-f1jofji7bl9u09zp
2012-07-30 15:33:43 +02:00
Fabien Pinckaers
d14c62fbe8
[IMP] copywriting summary of modules
...
bzr revid: fp@openerp.com-20120730132840-bchv2hmp40uqkwvb
2012-07-30 15:28:40 +02:00
vta vta@openerp.com
264d2c3365
[MERGE] Trunk.
...
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Thibault Delavallée
7b8c68b4a0
[IMP] point of sale: added css to fix the image width/height.
...
bzr revid: tde@openerp.com-20120730103519-fn4rgqr6gcs7luwz
2012-07-30 12:35:19 +02:00
Thibault Delavallée
97d48ebf51
[REF] pos.category: propagated change of category_image.
...
bzr revid: tde@openerp.com-20120730103451-bce6bqone6e9f690
2012-07-30 12:34:51 +02:00
Thibault Delavallée
82f4612f53
[REF] pos.category: category_image removed and replaced by image, image_medium and image_small, to standardize through OpenERP.
...
bzr revid: tde@openerp.com-20120730103301-rw0s7077m3ed7vj3
2012-07-30 12:33:01 +02:00
Thibault Delavallée
b9d62abd9a
[FIX] point of sale: removed forgotten tree/merge, probably due to a forgotten conflict to resolve.
...
bzr revid: tde@openerp.com-20120730091946-3ml79eb6u4flzina
2012-07-30 11:19:46 +02:00
Thibault Delavallée
9e3844d666
[REM] Removed file added during merge.
...
bzr revid: tde@openerp.com-20120730091907-y1tnw3fytfmz1qwq
2012-07-30 11:19:07 +02:00
vta@openerp.com
f920e391e0
[IMP] search view: review of the search views.
...
bzr revid: qdp-launchpad@openerp.com-20120730085027-0khspe8pl0t4118j
2012-07-30 10:50:27 +02:00
Thibault Delavallée
238598c041
[MERGE] Merged with addons/trunk.
...
bzr revid: tde@openerp.com-20120730081600-y92rgh002zhpp4tw
2012-07-30 10:16:00 +02:00
Atul Patel (OpenERP)
fee255cfcb
[ADD]: Add dependency sale_stock into point_of_sale
...
bzr revid: atp@tinyerp.com-20120727183633-jq3se5avp2k0hpeb
2012-07-28 00:06:33 +05:30
Frédéric van der Essen
b3f6c148c5
[FIX] point_of_sale: the pos session view was broken
...
bzr revid: fva@openerp.com-20120727153951-pby5mpquxjixcrj8
2012-07-27 17:39:51 +02:00
Frédéric van der Essen
68c2802fd9
[WIP] point_of_sale: adding untracked files before bisect galore
...
bzr revid: fva@openerp.com-20120727140552-a5b1j344aa60cemp
2012-07-27 16:05:52 +02:00
Frédéric van der Essen
e3c2ae9681
[WIP] point_of_sale: variable length ean prefixes
...
bzr revid: fva@openerp.com-20120727130010-82ddtyeva3r6l64c
2012-07-27 15:00:10 +02:00
Frédéric van der Essen
aa7fd93da2
[IMP] point_of_sale: better demo data
...
bzr revid: fva@openerp.com-20120726140607-8xu5bn6hott4jrtk
2012-07-26 16:06:07 +02:00
Frédéric van der Essen
3d47f6ec32
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120726095442-p61fnxm29l0piqg6
2012-07-26 11:54:42 +02:00
Frédéric van der Essen
e4d0897734
[IMP] point_of_sale: removed duplicated ean check code
...
bzr revid: fva@openerp.com-20120726095315-2e5c7r0a3gouymcc
2012-07-26 11:53:15 +02:00
Rucha (Open ERP)
4eb76030a6
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
Raphael Collet
df723a0b6c
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20120725133932-0cvvngral6nt8ixj
bzr revid: rco@openerp.com-20120725151612-lp3bozy0xb0gjrvp
2012-07-25 17:16:12 +02:00
Frédéric van der Essen
4201c58f36
[IMP] point_of_sale: edit ean wizards for users and products
...
bzr revid: fva@openerp.com-20120725142608-tsvrxvvxg42sx1yr
2012-07-25 16:26:08 +02:00
Frédéric van der Essen
ff4f70f120
[MERGE] from trunk
...
bzr revid: fva@openerp.com-20120725125407-fp7fasquds5oy0xv
2012-07-25 14:54:07 +02:00
pso (OpenERP)
e5da0e191b
[MERGE] Merged with main branch
...
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Frédéric van der Essen
26001a9b3c
[wip] point_of_sale: ean template last fixes
...
bzr revid: fva@openerp.com-20120725125115-dnvslwyo6m6q0xw7
2012-07-25 14:51:15 +02:00
Raphael Collet
495d222f4e
[IMP] point_of_sale: add OpenChatter notification after module installation
...
bzr revid: rco@openerp.com-20120725112900-bv2eixl6ojc4w28h
2012-07-25 13:29:00 +02:00
Saurang Suthar(OpenERP)
b7a5a1d928
[IMP] Improved warning messages for POS module
...
bzr revid: pso@tinyerp.com-20120725104932-1awd9eerplzglhui
2012-07-25 16:19:32 +05:30
Saurang Suthar(OpenERP)
e9f73afd66
[IMP] Improved warning messages for POS module
...
bzr revid: pso@tinyerp.com-20120725103449-iyhg19xu0m8ev0sk
2012-07-25 16:04:49 +05:30
Frédéric van der Essen
eded464697
[WIP] wip
...
bzr revid: fva@openerp.com-20120725101043-43oxlvi4ugg038c1
2012-07-25 12:10:43 +02:00
Rucha (Open ERP)
ab9981e565
[IMP]: Replaced tabs with 4 spaces in some xml demo files
...
bzr revid: rpa@tinyerp.com-20120725094836-fqa0fs31bygvzh5p
2012-07-25 15:18:36 +05:30
Rucha (Open ERP)
953cd056b4
[MERGE]: Merge with latest trunk-addons
...
bzr revid: rpa@tinyerp.com-20120725053226-e67t7qdy472jc3ev
2012-07-25 11:02:26 +05:30
Stephane Wirtel
9f299d9a20
[MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
...
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Ravish Murari (OpenERP)
7488a675b4
[FIX] removed rest of the base_group_extended group from addons
...
lp bug: https://launchpad.net/bugs/1027875 fixed
bzr revid: rmu@tinyerp.com-20120723112617-h7um6wkj22martms
2012-07-23 16:56:17 +05:30
Frédéric van der Essen
f1fbf44b5c
[WIP] point_of_sale: barcode validation wizard (wip)
...
bzr revid: fva@openerp.com-20120720170012-eqp81clbpbfsr3hl
2012-07-20 19:00:12 +02:00
Quentin (OpenERP)
ebdc4ebb62
[MERGE] label VAT to Tax
...
bzr revid: qdp-launchpad@openerp.com-20120720151554-fp5t5nsddjyb81jr
2012-07-20 17:15:54 +02:00
Turkesh Patel (Open ERP)
6e178d51ec
[IMP] point_of_sale: improved search views.
...
bzr revid: tpa@tinyerp.com-20120720124629-4eau5t3r09x7b5y2
2012-07-20 18:16:29 +05:30
Purnendu Singh (OpenERP)
d5ec4a6535
[IMP] update pot files
...
bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r
2012-07-20 17:14:02 +05:30
Raphael Collet
75abad6a61
[MERGE] trunk-module-summary (add field 'summary' on modules)
...
bzr revid: rco@openerp.com-20120720100339-sk3mx0qucujeqsxe
2012-07-20 12:03:39 +02:00
Raphael Collet
dee772d423
[FIX] in summary of modules: typos
...
bzr revid: rco@openerp.com-20120720093046-92l51ts5aaee9etq
2012-07-20 11:30:46 +02:00