Sagar Vora
70c4117c22
fix: unlink custom fields in patch
2022-07-14 15:02:37 +05:30
Sagar Vora
be4a44fccd
Merge remote-tracking branch 'upstream/develop' into ic-lingering-code
2022-07-14 14:36:14 +05:30
Rucha Mahabal
db586afc7b
chore: Remove Salary Component Accounts doctype from Accounts module
2022-07-13 13:38:58 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Marica
681b334236
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-11 11:22:51 +05:30
Sagar Vora
93f87cb6e2
chore: remove missed code for India localisation
2022-07-07 16:41:41 +05:30
Rucha Mahabal
2248276fe9
chore: Remove gratuity rule patch
2022-07-07 13:48:59 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Marica
b58d7d1c89
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-07-06 14:43:23 +05:30
Rucha Mahabal
2da427c023
patch: do not run deletion patch if HRMS is already installed
2022-07-04 14:54:23 +05:30
Rucha Mahabal
1497e26f82
fix: patches
2022-06-29 18:38:39 +05:30
Marica
1a749e2589
Merge branch 'develop' into make-image-field-obsolete-in-web-item
2022-06-29 10:25:30 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Rucha Mahabal
6f407d3c62
chore: fix code formatting
2022-06-28 12:29:22 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Rucha Mahabal
930e557fc6
fix: remove HR/Payroll patches
2022-06-27 20:25:16 +05:30
Rucha Mahabal
c8712b02f9
patch: Delete HR/Payroll doctypes
2022-06-27 19:59:04 +05:30
marination
9541354ec7
chore: Make image field obsolete in Website Item (redundant)
...
- Delete Image field and set `website_image` as form's image field for uploads
- Remove instances of `image` field access via Website Item
- Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image`
- Item -> Web Item via patch: `website_image` will be mapped with thumbnail
- Remove magic that auto-sets `website_image` from `image` in Website Item
2022-06-27 13:00:00 +05:30
Sagar Vora
0aafc75c90
fix: add missing print format
2022-06-26 18:36:00 +05:30
Sagar Vora
85c4c342d8
fix: improve patches
2022-06-26 18:30:54 +05:30
Sagar Vora
7f390fb755
Merge branch 'develop' into remove-india
2022-06-26 18:10:44 +05:30
Smit Vora
64de0d06ad
patch: remove custom field creation patch
2022-06-26 11:56:06 +05:30
Nabin Hait
f72d5506de
fix: get_all replace by sql
2022-06-25 15:08:45 +05:30
Nabin Hait
d8163f3e47
fix: set exchange rate
2022-06-25 11:40:23 +05:30
Nabin Hait
f904ac599e
fix: merge conflicts and sider issues
2022-06-25 11:40:23 +05:30
Smit Vora
8fb0997cf1
patch: remove related docs and warn
2022-06-24 21:59:28 +05:30
Smit Vora
3c9eea54a5
fix: remove student naming series
2022-06-24 13:42:07 +05:30
Sagar Vora
2e6919b7be
fix: remove more India patches
2022-06-24 14:14:12 +05:30
Sagar Vora
0810674c8a
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-24 13:08:40 +05:30
ruthra kumar
5826b7b071
fix: identify empty values "" in against_voucher columns
2022-06-21 19:50:50 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28
refactor: backport old subcontracting code
2022-06-20 23:10:02 +05:30
Sagar Vora
33b54c50ea
chore: remove ITC patch
2022-06-19 23:18:04 +05:30
Sagar Vora
ec9861266e
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-06-19 22:57:22 +05:30
s-aga-r
5002f1f1e5
feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI
2022-06-17 16:47:41 +05:30
Ankush Menat
6f2086d770
test: verify that all patches exist in patches.txt ( #31371 )
...
* chore: delete orphaned patches
* test: orphan/missing entries in patches.txt
[skip ci]
2022-06-16 22:15:06 +05:30
Ankush Menat
276267d5a6
fix: remove agriculture module from patch ( #31369 )
2022-06-15 15:26:05 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting
2022-06-13 03:00:53 -07:00
Deepesh Garg
3d76b1a093
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql
...
refactor: migrating data from GL to payment ledger using raw SQL
2022-06-10 17:15:58 +05:30
ruthra kumar
e2c52436da
refactor: migrate gl to payment ledger using sql
2022-06-10 13:17:43 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting
2022-06-08 04:27:24 -07:00
Ankush Menat
ee5bc58e9b
fix(job card): only hold during draft state ( #31243 )
2022-06-06 16:27:25 +05:30
s-aga-r
992ba974e2
Merge branch 'develop' into subcontracting
2022-06-03 13:25:49 +05:30
Rucha Mahabal
956a803be7
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-02 17:30:34 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch ( #31097 )
2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job
2022-06-01 12:15:42 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool ( #31183 )
2022-05-31 15:35:40 +05:30
Sagar Sharma
4ff734c25a
Merge branch 'develop' into subcontracting
2022-05-25 12:32:33 +05:30
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 ( #31118 )
2022-05-25 11:34:25 +05:30
