IntenseFinance/flectra
3
0 Fork 0
mirror of https://gitlab.com/flectra-hq/flectra.git synced 2026-10-25 23:40:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
887 Commits 4 Branches 47 Tags
56721ae19f517c156b1dedbf99be0b030105ac00
Commit Graph
887 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Meister 56721ae19f ♻️Make image build ready for f2.0 v2.0.alpha-2 2021-02-25 15:23:21 +01:00
Renzo Meister dcddd0a323 ♻️Make image build ready for f2.0 v2.0-alpha-1 2021-02-25 14:50:11 +01:00
Renzo Meister c4dedbbb9f ♻️Make image build ready for f2.0 2021-02-25 14:48:14 +01:00
Renzo Meister 76cb3f704a ♻️Make image build ready for f2.0 2021-02-25 13:49:00 +01:00
Renzo Meister 3c3635c45d ♻️Make image build ready for f2.0 2021-02-25 13:47:49 +01:00
Renzo Meister 183275ed9f 🎨 Docker base for F2.0 2021-02-24 11:43:48 +01:00
Renzo Meister 9ea0ea04bc Merge branch '2.0' into 2.0-jamotion 
# Conflicts:
#	addons/web_flectra/static/src/scss/font_rubik.css
#	addons/web_flectra/static/src/scss/font_rubik.css.map
 2021-02-23 16:21:24 +01:00
Parthiv Patel 450425664b [ADD] accounting reports module 2021-02-23 13:08:42 +00:00
Parthiv Patel 00bbf70b83 Merge branch 'master' into 'master' 
[IMP] updated the mail template colour with Flectra primary colour

See merge request flectra-hq/flectra!332
 2021-02-23 12:40:49 +00:00
Dhruvik Mevada dfe4f28457 [IMP] updated the mail template colour with flectra primary colour 2021-02-23 18:04:33 +05:30
Parthiv Patel b0c3b366d5 [ADD] account budget module 2021-02-23 11:16:29 +00:00
Parthiv Patel f1e5d45cb7 [ADD] account asset module 2021-02-23 11:15:57 +00:00
Parthiv Patel 81bc90d4c7 [ADD] account accountant module 2021-02-23 11:14:42 +00:00
Parthiv Patel b30b586953 Merge branch '2.0-dms-fix' into 'master' 
2.0 dms fix

See merge request flectra-hq/flectra!331
 2021-02-20 12:56:04 +00:00
Rohit Prajapati edeb819c94 2.0 dms fix 2021-02-20 12:56:04 +00:00
Parthiv Patel 5364c94a59 Merge branch '2.0-font-fix' into 'master' 
[FIX] Fixed Font Issue And Added More Font Options

See merge request flectra-hq/flectra!330
 2021-02-19 11:40:42 +00:00
rohit22799 5948f040fe [FIX] Fixed Font Issue And Added More Font Options 2021-02-19 17:00:31 +05:30
Dhruvik Mevada d8727d9451 [IMP] keyword changes 2021-02-19 10:10:48 +05:30
Parthiv Patel 608e806354 Merge branch '2.0-fix-theme-changer' into 'master' 
[FIX] Fixed Backend Theme Changer Issue

See merge request flectra-hq/flectra!329
 2021-02-16 11:01:28 +00:00
rohit22799 0fa57cbefb [FIX] Fixed Backend Theme Changer Issue 2021-02-16 15:56:23 +05:30
Parthiv Patel efa8d4a23c Merge branch 'patch-web_flectra' into 'master' 
FIXES for PWA, theme-customizer and sidebar.

See merge request flectra-hq/flectra!328
 2021-02-15 08:40:54 +00:00
Yannik Lieblinger dce7c8be85 FIXES for PWA, theme-customizer and sidebar. 2021-02-15 08:40:54 +00:00
Parthiv Patel 5065bc88cd Merge branch 'document-discount-2.0' into 'master' 
[ADD] sale_discount, account_discount: Document discount feature on sale orders and invoices

See merge request flectra-hq/flectra!327
 2021-02-12 10:58:56 +00:00
Renzo Meister 16b82d2414 [ADD] sale_discount: 
New implementation of sale_discount with full support
of tax reduction respecting also different taxes used
on sales positions
 2021-02-12 10:58:50 +00:00
Parthiv Patel b318ce618a Merge branch '2.0-gantt-chart' into 'master' 
[ADD] Lock Task On Condition

See merge request flectra-hq/flectra!326
 2021-02-11 06:32:43 +00:00
rohit22799 5839019499 [ADD] Lock Task On Condition 2021-02-11 11:31:36 +05:30
Parthiv Patel a0e82aeaf9 Merge branch 'patch' into 'master' 
[PATCH] Fix sidebar css issue for non-admin user.

See merge request flectra-hq/flectra!324
 2021-02-04 12:03:54 +00:00
Yannik Lieblinger 6b8ec60b8d [PATCH] Fix sidebar css issue for non-admin user. 2021-02-04 12:03:54 +00:00
Parthiv Patel 009de39446 Merge branch 'patch' into 'master' 
[Patch] PWA and Theme-Customizer

See merge request flectra-hq/flectra!323
 2021-02-04 08:45:49 +00:00
Yannik Lieblinger ecb6b2fd7a [Patch] PWA and Theme-Customizer 2021-02-04 08:45:49 +00:00
Parthiv Patel 05d7281cd9 Merge branch 'master-yanni-theme' into 'master' 
[BACKEND THEME] Adds a theme customizer, new sidebar implementation, pwa and css fixes.

See merge request flectra-hq/flectra!317
 2021-02-04 05:17:46 +00:00
Yannik Lieblinger 47715805e8 [BACKEND THEME] Adds a theme customizer, new sidebar implementation, pwa and css fixes. 2021-02-04 05:17:46 +00:00
Parthiv Patel 48847aedde Update ir_module.py 2021-02-01 04:58:49 +00:00
Parthiv Patel 00153566a0 Merge branch '2.0-dms-icon' into 'master' 
[ADD] Added DMS Icon

See merge request flectra-hq/flectra!320
 2021-01-13 13:36:15 +00:00
Rohit Prajapati 82ba499a60 [ADD] Added DMS Icon 2021-01-13 13:36:15 +00:00
Parthiv Patel c7ced206c7 Merge branch '2.0-dms' into 'master' 
2.0 Document Management System

See merge request flectra-hq/flectra!319
 2021-01-12 06:31:12 +00:00
rohit22799 ad9b6c4d21 [ADD] Document Management System 2021-01-11 12:10:57 +05:30
rohit22799 b2155c1991 [ADD] Document Management System 2021-01-11 12:00:18 +05:30
Parthiv Patel 12ec1898d4 Update __manifest__.py 2021-01-11 05:13:55 +00:00
Parthiv Patel 70c2988813 Merge branch 'gimitec-master-patch-68197' into 'master' 
Update en_GB.po

See merge request flectra-hq/flectra!318
 2021-01-11 04:52:12 +00:00
THANH VO d0d7176985 Update en_GB.po 2021-01-08 19:15:07 +00:00
Parthiv Patel 32ab9a48ce Merge branch '2.0-web-gantt' into 'master' 
[ADD] Web Gantt Chart

See merge request flectra-hq/flectra!316
 2021-01-08 13:25:27 +00:00
Rohit Prajapati 7d98387f0d [ADD] Web Gantt Chart 2021-01-08 13:25:26 +00:00
Parthiv Patel 0088cf48d6 Merge branch '2.0-web-drag-and-drop' into 'master' 
[ADD]  Drag And Drop To Create Attachments Feature

See merge request flectra-hq/flectra!315
 2021-01-08 07:06:17 +00:00
rohit22799 bbe661b9e2 [ADD] Drag And Drop To Create Attachments 2021-01-08 12:21:22 +05:30
rohit22799 9c78c35568 [ADD] Drag And Drop To Create Attachments 2021-01-08 12:20:05 +05:30
Parthiv Patel c1e0b604f2 Merge branch '2.0-web-flectra' into 'master' 
[ADD] License Terms And Changed Description In web_flectra module

See merge request flectra-hq/flectra!313
 2021-01-07 12:11:29 +00:00
Parthiv Patel 0e90146e85 Merge branch 'hr_payroll_nikul' into 'master' 
[ADD] HR Payroll

See merge request flectra-hq/flectra!314
 2021-01-07 12:10:59 +00:00
Nikul vasar 0f32e326b0 [ADD] HR Payroll 2021-01-07 12:10:58 +00:00
Gaurav Patel 074de137b4 [ADD] License Terms And Changed Description In web_flectra module 2021-01-06 14:51:18 +05:30