Commit Graph
1100 Commits
Author SHA1 Message Date
Parthiv Patel f5e1af70b0 [PATCH] Upstream patch - 29092021 2021-09-29 09:36:21 +00:00
Parthiv Patel 3e07c098e3 Merge branch 'master-upstream-patch-28092021' into 'master'
[PATCH] Upstream patch - 28092021

See merge request flectra-hq/flectra!445
2021-09-28 11:08:39 +00:00
Parthiv Patel be4d40e5dc [PATCH] Upstream patch - 28092021 2021-09-28 09:36:03 +00:00
Parthiv Patel 4fd0f3f660 Merge branch 'master-upstream-patch-27092021' into 'master'
[PATCH] Upstream patch - 27092021

See merge request flectra-hq/flectra!444
2021-09-27 11:15:31 +00:00
Parthiv Patel cb1d80e946 [PATCH] Upstream patch - 27092021 2021-09-27 09:36:44 +00:00
Parthiv Patel 1801641fa1 Merge branch 'master-upstream-patch-26092021' into 'master'
[PATCH] Upstream patch - 26092021

See merge request flectra-hq/flectra!443
2021-09-27 05:12:45 +00:00
Parthiv Patel a76e8e1330 Merge branch 'master-upstream-patch-25092021' into 'master'
[PATCH] Upstream patch - 25092021

See merge request flectra-hq/flectra!442
2021-09-27 05:12:33 +00:00
Parthiv Patel 32e27d24b9 Merge branch 'master-upstream-patch-24092021' into 'master'
[PATCH] Upstream patch - 24092021

See merge request flectra-hq/flectra!441
2021-09-27 05:12:30 +00:00
Parthiv Patel 8366448a04 Merge branch 'master-upstream-patch-23092021' into 'master'
[PATCH] Upstream patch - 23092021

See merge request flectra-hq/flectra!440
2021-09-27 05:12:22 +00:00
Parthiv Patel 2b346ea160 [PATCH] Upstream patch - 26092021 2021-09-26 09:36:16 +00:00
Parthiv Patel 018e4c94bc [PATCH] Upstream patch - 25092021 2021-09-25 09:37:39 +00:00
Parthiv Patel c5a9ef4d2e [PATCH] Upstream patch - 24092021 2021-09-24 09:36:13 +00:00
Parthiv Patel 38459e7da8 [PATCH] Upstream patch - 23092021 2021-09-23 09:36:26 +00:00
Parthiv Patel 69c4998b67 Merge branch 'master-upstream-patch-22092021' into 'master'
[PATCH] Upstream patch - 22092021

See merge request flectra-hq/flectra!439
2021-09-23 06:59:37 +00:00
Parthiv Patel cda845775a [PATCH] Upstream patch - 22092021 2021-09-22 09:36:04 +00:00
Parthiv Patel ef0be26471 Merge branch 'master-upstream-patch-21092021' into 'master'
[PATCH] Upstream patch - 21092021

See merge request flectra-hq/flectra!437
2021-09-21 12:34:29 +00:00
Parthiv Patel 77bab7bcd5 Merge branch 'master-upstream-patch-20092021' into 'master'
[PATCH] Upstream patch - 20092021

See merge request flectra-hq/flectra!436
2021-09-21 12:34:25 +00:00
Parthiv Patel 0f96daa00a Merge branch 'master-upstream-patch-19092021' into 'master'
[PATCH] Upstream patch - 19092021

See merge request flectra-hq/flectra!435
2021-09-21 12:34:21 +00:00
Parthiv Patel b8c85f498e Merge branch 'master-upstream-patch-18092021' into 'master'
[PATCH] Upstream patch - 18092021

See merge request flectra-hq/flectra!434
2021-09-21 12:34:17 +00:00
Parthiv Patel e30f7e6e9a Merge branch 'master-upstream-patch-17092021' into 'master'
[PATCH] Upstream patch - 17092021

See merge request flectra-hq/flectra!433
2021-09-21 12:33:49 +00:00
Parthiv Patel fbdac5593b [PATCH] Upstream patch - 21092021 2021-09-21 09:35:49 +00:00
Parthiv Patel dbe610890e [PATCH] Upstream patch - 20092021 2021-09-20 09:35:53 +00:00
Parthiv Patel ecceda937b [PATCH] Upstream patch - 19092021 2021-09-19 09:35:54 +00:00
Parthiv Patel 0d21bc35e3 [PATCH] Upstream patch - 18092021 2021-09-18 09:36:28 +00:00
Parthiv Patel d014791d90 [PATCH] Upstream patch - 17092021 2021-09-17 09:35:59 +00:00
Parthiv Patel d236c59a5c Merge branch 'master-upstream-patch-16092021' into 'master'
[PATCH] Upstream patch - 16092021

See merge request flectra-hq/flectra!432
2021-09-16 10:50:48 +00:00
Parthiv Patel 40600549f5 [PATCH] Upstream patch - 16092021 2021-09-16 09:36:45 +00:00
Parthiv Patel 451ad921df Merge branch 'master-upstream-patch-15092021' into 'master'
[PATCH] Upstream patch - 15092021

See merge request flectra-hq/flectra!431
2021-09-16 04:54:57 +00:00
Parthiv Patel 0c8cc5efca [PATCH] Upstream patch - 15092021 2021-09-15 11:36:09 +00:00
Parthiv Patel 327a8372ec Merge branch 'master-upstream-patch-14092021' into 'master'
[PATCH] Upstream patch - 14092021

See merge request flectra-hq/flectra!430
2021-09-14 16:21:06 +00:00
Parthiv Patel 1ed0693a3a [PATCH] Upstream patch - 14092021 2021-09-14 14:49:31 +00:00
Parthiv Patel a432d6ca19 Update requirements.txt 2021-09-14 14:40:27 +00:00
Parthiv Patel 545b310aad Merge branch '2.0-poojan-payroll_salary_structure' into 'master'
[FIX]fixed payroll salary structure type issue

See merge request flectra-hq/flectra!429
2021-09-10 11:12:01 +00:00
Parthiv Patel 1cabe564f4 Merge branch '2.0-jayank-field_label' into 'master'
[2.0][FIX] field label

See merge request flectra-hq/flectra!428
2021-09-10 10:41:40 +00:00
poojan-21 df50dced4f [FIX]fixed payroll salary structure type issue 2021-09-10 15:59:00 +05:30
jayankagahara 68d2a0f08f [2.0][FIX] field label 2021-09-09 17:34:47 +05:30
Parthiv Patel 59a2f7e0bd Merge branch 'master' of gitlab.com:flectra-hq/flectra 2021-09-08 10:22:08 +00:00
Parthiv Patel e1685b323d [FIX] license 2021-09-08 10:21:57 +00:00
Parthiv Patel 986e225e1e Merge branch 'master-upstream-patch-08092021' into 'master'
[PATCH] Upstream patch - 08092021

See merge request flectra-hq/flectra!426
2021-09-08 07:34:21 +00:00
Parthiv Patel e49b53f489 Merge branch '2.0-poojan-payroll' into 'master'
[FIX]fixed demo data in payroll

See merge request flectra-hq/flectra!427
2021-09-08 07:33:08 +00:00
poojan-21 2d130af092 [FIX]fixed demo data in payroll 2021-09-08 12:57:19 +05:30
Parthiv Patel 0ca35e2098 [PATCH] Upstream patch - 08092021 2021-09-08 06:54:56 +00:00
Parthiv Patel 1f4e216c17 Merge branch 'master-upstream-patch-04092021' into 'master'
[PATCH] Upstream patch - 04092021

See merge request flectra-hq/flectra!425
2021-09-04 06:46:44 +00:00
Parthiv Patel 0b5611e3bd [PATCH] Upstream patch - 04092021 2021-09-04 06:12:02 +00:00
Parthiv Patel f7590fdbc3 [FIX] names 2021-09-01 09:51:27 +00:00
Parthiv Patel aef423fb3c Merge branch 'master-upstream-patch-01092021' into 'master'
[PATCH] Upstream patch - 01092021

See merge request flectra-hq/flectra!424
2021-09-01 08:18:59 +00:00
Parthiv Patel 167ec0116a [PATCH] Upstream patch - 01092021 2021-09-01 04:49:59 +00:00
Parthiv Patel ee040cbd30 Merge branch '2.0-harshad-smart-button' into 'master'
[FIX]Smart button in project

See merge request flectra-hq/flectra!423
2021-08-24 12:20:33 +00:00
harshad97 d0a33af478 [FIX]Smart button in project 2021-08-24 16:10:26 +05:30
Parthiv Patel cccf4e89a2 Merge branch 'master-upstream-patch-21082021' into 'master'
[PATCH] Upstream patch

See merge request flectra-hq/flectra!422
2021-08-21 11:57:13 +00:00