Commit Graph
1046 Commits
Author SHA1 Message Date
Parthiv Patel 97ec639c19 [PATCH] Upstream patch 2021-08-18 15:35:09 +00:00
Parthiv Patel 30d2834fe6 Merge branch 'master-upstream-patch-17082021' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!418
2021-08-18 15:28:03 +00:00
Parthiv Patel 535673cd98 Merge branch '2.0-gaurav-website' into 'master'
[FIX] Grouped kanban on mobile not working (Issue #315)

See merge request flectra-hq/flectra!419
2021-08-18 11:32:12 +00:00
Gaurav Patel 3a7aef4b15 [FIX] Grouped kanban on mobile not working (Issue #315) 2021-08-18 15:52:44 +05:30
Parthiv Patel 2ad63e7e46 Upstream Patch for core 2021-08-18 13:45:26 +05:30
Parthiv Patel 846d11e2ac [PATCH] Upstream patch 2021-08-17 02:30:33 +00:00
Parthiv Patel e008b7fc3a [FIX] templates 2021-08-16 12:33:33 +00:00
Parthiv Patel 44eba23d04 Merge branch 'master' into 'master'
[FIX] account_bank_statement_import: post bank statement after import

See merge request flectra-hq/flectra!416
2021-08-16 12:29:25 +00:00
Parthiv Patel 24d87f9f9d Merge branch '2BIT_GMBH-2.0-patch-16106' into 'master'
[FIX] fixed translation mistake with code fragements

See merge request flectra-hq/flectra!417
2021-08-16 12:29:11 +00:00
2BIT GmbH 8cc68f12fb fixed translation mistake with code fragements 2021-08-13 12:43:25 +00:00
Renzo Meister 928de43260 [FIX] account_bank_statement_import: post bank statement after import to show not reconciled lines on journal dashboard
and fix method which is defined twice
2021-08-10 12:02:29 +02:00
Parthiv Patel 23a734c228 Merge branch 'master-upstream-patch-09082021' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!415
2021-08-09 08:03:28 +00:00
Parthiv Patel 2e4b9e642d [PATCH] Upstream patch 2021-08-09 04:48:23 +00:00
Parthiv Patel 9ffe79ad2b Merge branch 'master-upstream-patch' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!414
2021-08-01 11:32:32 +00:00
Parthiv Patel 6c84a4a4af [PATCH] Upstream patch 2021-08-01 11:31:12 +00:00
Parthiv Patel e704b782c0 [FIX] issue with budget 2021-07-30 11:13:39 +00:00
Parthiv Patel 9aec7a7604 Merge branch 'master-upstream-patch' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!413
2021-07-30 11:12:21 +00:00
Parthiv Patel a494485a26 [PATCH] Upstream patch 2021-07-30 10:54:27 +00:00
Parthiv Patel 7ce29bcdce Merge branch '2.0-himanee-helpdesk' into 'master'
[MODIFIED]2.0 solve the email issue in helpdesk.

See merge request flectra-hq/flectra!412
2021-07-26 07:07:33 +00:00
himanee d32469294a [MODIFIED]2.0 solve the email issue in helpdesk. 2021-07-26 12:34:39 +05:30
Parthiv Patel f424c0b803 Merge branch 'master-upstream-patch' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!410
2021-07-23 12:17:38 +00:00
Parthiv Patel e73c8c6702 [PATCH] Upstream patch 2021-07-23 11:48:48 +00:00
Parthiv Patel dff3caff12 Merge branch 'fix/iap' into 'master'
[FIX] missing dependency to IAP

See merge request flectra-hq/flectra!409
2021-07-16 07:10:39 +00:00
Parthiv Patel c515e89b9e [FIX] name in templates 2021-07-16 07:08:43 +00:00
Renzo Meister b05b936ba6 [FIX] missing dependency to IAP
this will break upgrade script in some cases
2021-07-16 08:33:00 +02:00
Parthiv Patel 2b4e887aac Merge branch 'master-upstream-patch' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!407
2021-07-09 08:28:15 +00:00
Parthiv Patel e08f4744ab [PATCH] upstream patching base 2021-07-09 08:18:30 +00:00
Parthiv Patel fa8d45f760 [PATCH] Upstream patch 2021-07-09 06:22:06 +00:00
Parthiv Patel 166f242fbf Merge branch 'master' of gitlab.com:flectra-hq/flectra 2021-07-09 06:06:25 +00:00
Parthiv Patel 6957509c41 [FIX] app id 2021-07-09 06:06:14 +00:00
Parthiv Patel 60a4db4519 Merge branch '2.0-jayank-test_case_failed_timesheet' into 'master'
[FIX] project_billing_options test case error

See merge request flectra-hq/flectra!377
2021-07-07 08:38:35 +00:00
Parthiv Patel 87703dbd0a Merge branch '2.0-jayank-dms_test_case' into 'master'
2.0 jayank dms test case

See merge request flectra-hq/flectra!395
2021-07-07 08:38:10 +00:00
Parthiv Patel df60e3f195 Merge branch '2.0-jayank-account_warnings' into 'master'
[FIX][2.0] account field label warning fixed

See merge request flectra-hq/flectra!405
2021-07-07 08:37:12 +00:00
jayankaghara b7adc7149f [FIX][2.0] account field label warning fixed 2021-07-07 13:54:16 +05:30
Parthiv Patel 327b1a06c6 Merge branch 'master-upstream-patch' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!404
2021-07-06 09:00:56 +00:00
Parthiv Patel 956a6c97de [PATCH] Upstream patch 2021-07-06 08:36:16 +00:00
Parthiv Patel da14a8fe88 Merge branch 'master' of gitlab.com:flectra-hq/flectra v2.0.0 2021-07-06 08:29:32 +00:00
Parthiv Patel 3dc6e12d94 [FIX] autoinstall removed 2021-07-06 08:29:15 +00:00
Parthiv Patel 4277ec3bce Merge branch 'master-upstream-patch' into 'master'
Master upstream patch

See merge request flectra-hq/flectra!403
2021-07-02 12:13:21 +00:00
Parthiv Patel ed061991dd Master upstream patch 2021-07-02 12:13:20 +00:00
Parthiv Patel 5b378526e9 Merge branch 'himanee-helpdesk-changes' into 'master'
[MODIFIED]solved the issue of mail acknowledgment.

See merge request flectra-hq/flectra!402
2021-06-30 16:16:15 +00:00
Himanee Dwivedi 19f29a0920 [MODIFIED]solved the issue of mail acknowledgment. 2021-06-30 16:16:14 +00:00
Parthiv Patel fc5d6b20b4 Merge branch 'master-upstream-patch' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!401
2021-06-27 10:01:14 +00:00
Parthiv Patel 93293adb19 [PATCH] Upstream patch 2021-06-27 10:01:14 +00:00
Parthiv Patel 45ece082e2 Merge branch 'master-upstream-patch' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!399
2021-06-20 11:42:30 +00:00
Parthiv Patel 8331e668e9 [PATCH] Upstream patch 2021-06-20 11:41:40 +00:00
Parthiv Patel 7fa7ea998f [FIX] colors 2021-06-20 11:09:21 +00:00
Parthiv Patel 3e576b368d [PATCH] Upstream patch 2021-06-20 11:03:19 +00:00
Parthiv Patel 45655fd76d Merge branch 'master' of gitlab.com:flectra-hq/flectra 2021-06-20 09:01:39 +00:00
Parthiv Patel 0340b9a762 [FIX] missing dependencies 2021-06-18 07:05:48 +00:00