Commit Graph

564 Commits

Author SHA1 Message Date
e57c6ddf1c Merge branch '1.0' of https://gitlab.com/flectra-hq/flectra into 1.0 2018-12-04 08:38:35 +01:00
Parthiv Patel
802b1fe09e Merge branch 'master-gst' into 'master'
[ADD]:Reverse charge mechanism in GST

See merge request flectra-hq/flectra!172
2018-12-03 06:48:13 +00:00
Parthiv Patel
c3c8c9ed0b Merge branch 'master-l10n_ae' into 'master'
[IMP]:Add demo data and changes in view

See merge request flectra-hq/flectra!171
2018-12-03 06:47:45 +00:00
Haresh Chavda
317b7583ba [IMP]:Add demo data and changes in view 2018-12-03 06:47:45 +00:00
Parthiv Patel
5bd42a122c Merge branch 'master-bhumika-hr-payroll' into 'master'
Master bhumika hr payroll

Closes #137

See merge request flectra-hq/flectra!174
2018-12-03 06:36:10 +00:00
Parthiv Patel
2528a1f555 Merge branch 'master-bhumika-report-wkhtmltopdf' into 'master'
[IMP]: Updated report fix related to wkhtmltopdf

See merge request flectra-hq/flectra!173
2018-12-03 06:08:40 +00:00
Haresh Chavda
e9980155cb [ADD]:Reverse charge mechanism in GST 2018-12-03 11:28:24 +05:30
Bhumika Trivedi
9ec3993757 [IMP]: Updated access rights and record rules for hr, hr contract and hr payroll 2018-11-30 17:34:12 +05:30
Bhumika Trivedi
efa255c886 [IMP]: Updated report fix related to wkhtmltopdf 2018-11-30 14:04:35 +05:30
ef822e9442 Merge branch 'master' of https://gitlab.com/flectra-hq/flectra into 1.0 2018-11-27 09:15:34 +01:00
Parthiv Patel
d4382431bd Merge branch 'master-project-issue' into 'master'
[FIX]fix issue of set cover image for project module

See merge request flectra-hq/flectra!170
2018-11-26 12:41:39 +00:00
Riddhi Kansara
649abf961e [FIX]fix issue of set cover image for project module 2018-11-26 16:57:23 +05:30
Parthiv Patel
7854da5a9b Merge branch 'master-multi-branch' into 'master'
[IMP]:Issues-145, Issues-147

See merge request flectra-hq/flectra!169
2018-11-22 05:01:33 +00:00
Haresh Chavda
4f7a4fd533 [IMP]:Issues-145, Issues-147 2018-11-21 17:49:04 +05:30
Parthiv Patel
32353100ea Merge branch 'flectra-license-server' into 'master'
[ADD] Online delayed release support

See merge request flectra-hq/flectra!166
2018-11-19 12:38:36 +00:00
Hiren Jungi
091dbcc487 [ADD] Online delayed release support 2018-11-16 14:59:19 +05:30
64b0449b75 Merge branch '1.0' of https://gitlab.com/flectra-hq/flectra into 1.0 2018-11-14 07:52:48 +01:00
Parthiv Patel
7e340561d3 Merge branch 'master' into 'master'
[I18N][IMP]Improve french translations on web and mail addons

See merge request flectra-hq/flectra!167
2018-11-14 06:41:26 +00:00
Parthiv Patel
cf0ac3ada1 Merge branch 'master-bhumika-helpdesk' into 'master'
[FIX]: Updated kanban view of helpdesk to remove quick creation of groups

See merge request flectra-hq/flectra!168
2018-11-14 06:21:35 +00:00
Bhumika Trivedi
f6514f9c12 [FIX]: Updated kanban view of helpdesk to remove quick creation of groups 2018-11-14 11:05:59 +05:30
97dae5ba90 [I18N][IMP]Improve french translations on web and mail addons 2018-11-08 16:49:53 +01:00
5fffc89327 [I18N][IMP]Improve french translations on web and mail addons 2018-11-08 16:48:46 +01:00
Parthiv Patel
0f3b6cc58a Merge branch 'master_redirect_mail_issue_yusuf' into 'master'
[FIX] Controllers Error: Issue #138 based on log

See merge request flectra-hq/flectra!165
2018-11-02 12:04:11 +00:00
Yusuf Kapasi
ed1643ecae [FIX] Controllers Error: Issue #138 based on log 2018-11-02 16:50:30 +05:30
Parthiv
97d95a47fc [FIX] pycrypto for builds 2018-11-01 11:33:32 +05:30
Parthiv
b55f10ae64 [REL] Flectra v1.5 Rufous 2018-11-01 10:52:32 +05:30
Parthiv Patel
35046ba1b9 Merge branch 'flectra-license-server' into 'master'
[ADD] support for delayed release

See merge request flectra-hq/flectra!163
2018-10-31 15:00:42 +00:00
Parthiv Patel
11cf3affa8 Merge branch 'master_account_tax' into 'master'
[FIX] Wrong order of taxes in quotation

See merge request flectra-hq/flectra!164
2018-10-31 13:35:32 +00:00
Hiren Jungi
5cf5633245 [ADD] support for delayed release 2018-10-31 19:03:06 +05:30
Haresh Chavda
a92da3634f [FIX] Wrong order of taxes in quotation 2018-10-31 18:26:06 +05:30
Parthiv Patel
c3cd4c4867 Merge branch 'flectra-app-store' into 'master'
[IMP] improvement on app store.

See merge request flectra-hq/flectra!162
2018-10-31 11:53:56 +00:00
Chintan Ambaliya
a61f88bf1e [IMP] improvement on app store. 2018-10-31 16:22:00 +05:30
Parthiv
bdbf2c19c4 [FIX] uncommented manifest 2018-10-30 15:39:16 +05:30
Parthiv Patel
6828cb8673 Merge branch 'master-purchase' into 'master'
[IMP]: Issues:132 Two Shipments are created for PO with Multi Routing enabled

See merge request flectra-hq/flectra!161
2018-10-29 13:00:13 +00:00
Haresh Chavda
c775f2d078 [IMP]: Issues:132 Two Shipments are created for PO with Multi Routing enabled 2018-10-29 16:06:04 +05:30
Parthiv Patel
aeb9971e41 Merge branch 'master-base-multi-branch' into 'master'
[FIX]: Fixed Purchase Order Testcase issue

See merge request flectra-hq/flectra!160
2018-10-29 10:05:21 +00:00
Hansa Rathod
1745ec46ac [FIX]: Fixed Purchase Order Testcase issue 2018-10-29 14:52:06 +05:30
Parthiv Patel
763e6327f1 Merge branch 'patch-1' into 'master'
fix issue with no db name supplied

See merge request flectra-hq/flectra!159
2018-10-27 14:16:51 +00:00
Neha
817b65353e fix issue with no db name supplied 2018-10-27 14:15:37 +00:00
Parthiv
327f5a88ff [FIX] text for app store 2018-10-27 15:22:07 +05:30
Parthiv Patel
a6e18e1dfc Merge branch 'master-backport' into 'master'
[ADD] initial backport from v12

See merge request flectra-hq/flectra!153
2018-10-27 09:11:07 +00:00
Parthiv Patel
fbbb803e47 [ADD] initial backport from v12 2018-10-27 09:11:07 +00:00
Parthiv Patel
b1929364fe Merge branch 'flectra-app-store' into 'master'
[IMP] Flectra App Store: User can direct install/download apps from flectraHQ store.

See merge request flectra-hq/flectra!158
2018-10-26 13:09:57 +00:00
Chintan Ambaliya
77b8adfaab [IMP] Flectra App Store: User can direct install/download apps from flectraHQ store. 2018-10-26 17:48:42 +05:30
Parthiv Patel
02c5ecba43 Merge branch 'master-base-multi-branch' into 'master'
[FIX]: Account test case fail issue

See merge request flectra-hq/flectra!157
2018-10-26 09:46:42 +00:00
Hansa Rathod
542bd61eb4 [FIX]: Account test case fail issue 2018-10-26 14:39:28 +05:30
Parthiv Patel
6c04736170 Merge branch 'master-l10n_ae' into 'master'
[IMP]: Code optimized and demo data error solved for UAE VAT

See merge request flectra-hq/flectra!156
2018-10-26 08:08:02 +00:00
Haresh Chavda
3eb97d72a9 [IMP]: Code optimized and demo data error solved 2018-10-26 12:49:53 +05:30
Parthiv Patel
920da5880e Merge branch 'master-l10n_ae_extend' into 'master'
[ADD] Unite Arab Emirates (UAE) VAT Implementation

See merge request flectra-hq/flectra!154
2018-10-25 12:42:48 +00:00
Haresh Chavda
ff31a8ff33 [ADD] Unite Arab Emirates (UAE) VAT Implementation 2018-10-25 12:42:48 +00:00