Commit Graph

317 Commits

Author SHA1 Message Date
Siddharth Bhalgami
2b42b1b300 [IMP] /shop page variants (Total 3 Variants !!)
- (Default) Default one with products listing
- (Option1) Categorized Shop Page with all listing of products category
- (Option2) Blank Shop Page with no content! User can design their own /shop page

User can easily choose any one option for /shop page from `Customize` menu at a time.
2018-02-12 18:44:52 +05:30
Parthiv Patel
a5fa03a1be Merge branch 'master-multi-branch' into 'master'
[IMP]: Feature: New Branch Configuration and Setup

See merge request flectra-hq/flectra!25
2018-02-12 11:47:42 +00:00
kunjal patel
462167e087 [IMP]: Feature: New Branch Configuration and Setup 2018-02-12 11:43:43 +00:00
Parthiv Patel
09dd9328d8 Merge branch 'master-sale-account-discount' into 'master'
[IMP] Check condition if gross amount exists

See merge request flectra-hq/flectra!24
2018-02-12 11:26:09 +00:00
Flectra
141d7f52bd [FIX] cla 2018-02-12 14:21:15 +05:30
Flectra
637e7edc2b [FIX] doc 2018-02-12 14:21:15 +05:30
Flectra
03282c19f1 [FIX] cla 2018-02-11 23:56:08 -08:00
Flectra
dafaed76d5 [FIX] doc 2018-02-11 23:55:56 -08:00
Haresh Chavda
ef8fc58c3c [IMP] Check condition if gross amount exists 2018-02-09 11:34:22 +05:30
Parthiv Patel
5b462b14b1 Merge branch 'master-cron-log' into 'master'
Scheduled failure Logs and keep days for email .

See merge request flectra-hq/flectra!22
2018-02-08 09:24:02 +00:00
kunjal patel
eccbea79bb Scheduled failure Logs and keep days for email . 2018-02-08 09:21:46 +00:00
Parthiv Patel
5d8eb4fb9f Merge branch 'master-sale-account-discount' into 'master'
[IMP] Remove unnecessary code

See merge request flectra-hq/flectra!23
2018-02-08 09:04:37 +00:00
Haresh Chavda
c71b512ea1 [IMP] Remove unnecessary code 2018-02-08 10:04:47 +05:30
Parthiv Patel
75b675cb95 Merge branch '1.0-sheetal' into 'master'
[ADD]:Alpha3 iso country code field for res.country

See merge request flectra-hq/flectra!21
2018-02-02 12:35:07 +00:00
sheetalPatil
5ad248a3e7 [ADD]:Flectra alpha3 iso country code field added 2018-02-02 11:21:32 +05:30
Chinmayi Vyas
310e414497 [ADD]empty group on customer invoice and sale order's form view to set left side block beside subtotal group
previously, difficult to set any fields to the left side of subtotal group in inherited views,
now use <xpath expr="//group[@name='left_panel']" position="inside"> to add fields.
2018-02-01 13:08:10 +05:30
Mayank Vara
5dc9d9a6d6 [FIX]index file style revert 2018-01-31 17:52:36 +05:30
FlectraHQ Admin
49f9021614 Merge branch 'master-account' into 'master'
[FIX]: Configuration wizard logo : Issue #9.

See merge request flectra-hq/flectra!19
2018-01-31 09:53:26 +00:00
thomi
aa71509781 [IMP] account: missing translations 2018-01-31 13:06:08 +05:30
thomi
be7e525d16 [IMP] account_discount: translations 2018-01-31 13:05:58 +05:30
Kunjal
7047f5a0c6 [FIX]: Configuration wizard logo : Issue #9. 2018-01-31 12:59:53 +05:30
FlectraHQ Admin
5fab9ebbbe Merge branch 'master-branding' into 'master'
[IMP] comment branding code of power by

See merge request flectra-hq/flectra!18
2018-01-30 11:24:49 +00:00
Haresh Chavda
864f1781e8 [IMP] comment branding code of power by 2018-01-30 15:44:17 +05:30
FlectraHQ Admin
d3b3dec9cc Merge branch 'master-account' into 'master'
[FIX]: Full Accounting Features.

See merge request flectra-hq/flectra!17
2018-01-30 10:07:21 +00:00
Kunjal
c6be9a7b66 [FIX]: Full Accounting Features. 2018-01-30 14:33:03 +05:30
Parthiv Patel
989c0f8e3e Merge branch 'master-purchase-indent' into 'master'
Master purchase indent

See merge request flectra-hq/flectra!15
2018-01-29 11:39:21 +00:00
Haresh Chavda
887dec3ed5 Master purchase indent 2018-01-29 11:35:08 +00:00
Parthiv Patel
1d4dae4cb4 Merge branch 'master-multi-branch' into 'master'
[FIX]: Sale report issue : #5.

See merge request flectra-hq/flectra!14
2018-01-29 09:27:31 +00:00
Kunjal
8145e84f1f [FIX]: Sale report issue : #5. 2018-01-29 12:08:45 +05:30
Parthiv Patel
549fa198f1 Update README.md 2018-01-27 10:27:28 +00:00
Parthiv Patel
6d2049b373 Merge branch 'master-purchase-indent' into 'master'
[ADD]:Purchase Indent

See merge request flectra-hq/flectra!10
2018-01-25 13:34:19 +00:00
flectra-admin
fc3fa9dc77 [REL] Flectra 1.0 2018-01-25 18:34:51 +05:30
Mayank Vara
743c399aac [ADD] Themes which support Multi-Website features. Added 2 themes: Theme Art & Theme Techreceptives 2018-01-25 18:17:06 +05:30
Parthiv Patel
9394e7a28c Merge branch 'master-sale-account-discount' into 'master'
[IMP/ADD] Add Sales and Account Discount Test Cases and Remove Branding In Emails

See merge request flectra-hq/flectra!12
2018-01-25 12:21:27 +00:00
FlectraHQ Admin
795b88a83d Merge branch 'master-multi-branch' into 'master'
[FIX]: Account report : Multi branch.

See merge request flectra-hq/flectra!13
2018-01-25 09:11:28 +00:00
Kunjal
b91cd5ed79 [FIX]: Account report : Multi branch. 2018-01-25 14:06:41 +05:30
Haresh Chavda
5627e1e297 [IMP/ADD] Add Sales and Account Test Cases and Remove sent by code in flectra 2018-01-25 12:37:16 +05:30
Fatemi Lokhandwala
4374cda18f [ADD]:Purchase Indent 2018-01-25 11:52:10 +05:30
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