Commit Graph

146 Commits

Author SHA1 Message Date
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
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