Commit Graph

529 Commits

Author SHA1 Message Date
Parthiv Patel
778eef5b33 Merge branch 'master' into 'master'
[FIX] account_discount: calculation if tax option included used

See merge request flectra-hq/flectra!11
2018-01-24 13:01:08 +00:00
thomi
91c9454281 [FIX] account_discount: calculation if tax option included used 2018-01-24 13:14:47 +01:00
Parthiv Patel
64a636b09b Update .gitlab-ci.yml 2018-01-24 11:30:57 +00:00
Parthiv Patel
bbd35912db Update .gitlab-ci.yml 2018-01-24 11:25:05 +00:00
Parthiv Patel
172561501c Update requirements.txt 2018-01-24 11:11:06 +00:00
Parthiv Patel
92587f7883 Merge branch 'master' into 'master'
[FIX] sales_discount: calculation if tax option included used

See merge request flectra-hq/flectra!9
2018-01-24 10:49:27 +00:00
Chintan Ambaliya
15cfca3e68 [ADD] Custom RTL Stylesheet 2018-01-24 12:59:23 +05:30
Siddharth Bhalgami
b70bbf4028 [FIX] Fixed Image Issue in Language Flag Snippet Template 2018-01-24 11:38:11 +05:30
Siddharth Bhalgami
5c5629ae10 [ADD/IMP] Added RTL support which depends on language direction(left-to-right/right-to-left), Display language flag icon in User profile 2018-01-24 10:20:51 +05:30
thomi
775913b9dd [FIX] sales_discount: calculation if tax option included used 2018-01-23 15:12:15 +01:00
Parthiv Patel
b2f2d45dc6 Merge branch 'master-multi-branch' into 'master'
Mail test case solved

See merge request flectra-hq/flectra!8
2018-01-23 12:20:23 +00:00
Parthiv Patel
a5e11768e1 Merge branch 'master' into 'master'
[IMP] web_editor: translations

See merge request flectra-hq/flectra!7
2018-01-23 11:53:22 +00:00
Haresh Chavda
41e383e17f [IMP] Mail test case solved 2018-01-23 17:06:24 +05:30
thomi
4b1ecc6ba2 [IMP] web_editor: translations 2018-01-23 10:12:23 +01:00
FlectraHQ Admin
f55ab37fa3 Merge branch 'master-multi-branch' into 'master'
Improve Multi Branch

See merge request flectra-hq/flectra!6
2018-01-23 08:25:30 +00:00
Haresh Chavda
9b7034a258 [IMP] Mail test cases 2018-01-23 12:50:05 +05:30
Haresh Chavda
113f9601f2 [IMP] Assign group in branch 2018-01-23 12:10:28 +05:30
Kunjal
c2c2f9e4fc [FIX]: Multi branch improvement. 2018-01-23 12:06:24 +05:30
FlectraHQ Admin
15446271be Update README.md 2018-01-23 05:02:43 +00:00
FlectraHQ Admin
c05e2ed7c4 Update README.md 2018-01-23 05:02:25 +00:00
FlectraHQ Admin
af82b539b8 Merge branch 'master' into 'master'
[ADD] sales_discount: translation

See merge request flectra-hq/flectra!4
2018-01-22 13:35:01 +00:00
chintan-ambaliya
31f5af381e [FIX] Solve Internal error during Upload/Add image in form view 2018-01-22 14:43:10 +05:30
Kaushal Prajappati
32d5a77281 [FIX] website menu display 2018-01-22 11:13:14 +05:30
Kunjal
effce68e09 [FIX]: Multi Branch : Purchase, Sale stock. 2018-01-19 19:06:50 +05:30
Kunjal
5993da4d2a [ADD]: Multi Branch : Sale, Account. 2018-01-19 19:06:50 +05:30
thomi
807fd0cec4 [ADD] sales_discount: translation 2018-01-19 13:57:39 +01:00
Chintan Ambaliya
dbdbad7ab1 [ADD] Drag & Drop Single or Multiple file(s) for Attachment(s) (Form View) 2018-01-19 17:42:32 +05:30
Kaushal Prajappati
07d7f19efa a[IMP]menu snippet 2018-01-19 17:39:08 +05:30
Haresh Chavda
4b4e078745 [IMP] Test cases sequence chnage and solved 2018-01-19 17:35:17 +05:30
Haresh Chavda
4933cf35a5 [IMP] Solved xpath replace issues 2018-01-19 16:15:28 +05:30
Parthiv Patel
e292f30258 Merge branch 'master' into 'master'
[IMP] l10n_ch: translations

See merge request flectra-hq/flectra!3
2018-01-19 10:04:38 +00:00
thomi
f482f19d95 [IMP] l10n_ch: translations 2018-01-19 10:02:33 +01:00
Parthiv Patel
0836bcca55 Separate jobs for base and all testing. 2018-01-19 07:20:38 +00:00
Yusuf Kapasi
620bc529c1 [FIX] fixed warning for account tag 2018-01-18 18:20:15 +05:30
Siddharth Bhalgami
7dece5564f [FIX] Change Odoo to Flectra in database_manager.html 2018-01-18 18:13:37 +05:30
Kaushal Prajappati
e5d7434bc1 [IMP] Payment and Payment Gateway compatible for Multi Website 2018-01-18 17:39:45 +05:30
Haresh Chavda
aba1a60084 [IMP] Set Auto install true and change configuration view, change test cases, solved flake8 and pep8 2018-01-18 16:59:27 +05:30
flectra-admin
9985810340 [ODOO] Odoo updates till commit ref: 529a8f5aa8 2018-01-18 16:56:22 +05:30
Parthiv Patel
3d05cc9726 Update CONTRIBUTING.md 2018-01-18 11:07:13 +00:00
Flectra
78b79441ea [REM] github folder 2018-01-18 02:05:37 -08:00
Kunjal
88c85b8291 [ADD]: Project Scrum. 2018-01-18 15:28:29 +05:30
Rutuba Chavda
804e929e28 [IMP]Change in dependencies and fixed testcases of rma module 2018-01-18 15:10:48 +05:30
Kaushal Prajappati
a84a9fce36 [ADD]REST API for flectra 2018-01-18 14:54:14 +05:30
Flectra
eccaf76fa0 [ADD] bug template fix 2018-01-18 00:55:16 -08:00
Flectra
1eeaf252fb [ADD] bug template 2018-01-18 00:52:37 -08:00
Flectra
247d4384dc Merge branch 'master' of gitlab.com:flectra-hq/flectra 2018-01-17 23:28:07 -08:00
Flectra
509d934191 [REN] namespace rename 2018-01-17 23:27:06 -08:00
Flectra
ffd2140c92 [REN] namespace rename 2018-01-17 23:18:42 -08:00
Parthiv Patel
82bf201fbd Merge branch 'master-enterprise-flags' into 'master'
[FIX] removed enterprise tags

See merge request flectra-hq/flectra!1
2018-01-18 06:05:18 +00:00
Yusuf Kapasi
d3c128384b [FIX] removed enterprise tags 2018-01-17 19:59:30 +05:30