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
Sagar Sharma
07dc5f180d
Merge branch 'develop' into subcontracting
2022-05-21 10:02:47 +05:30
ruthra kumar
8e72f19bfb
feat: patch to migrate gl entries to payment ledger
2022-05-20 18:21:47 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
323bdf85ce
feat: SL and GL reposting
2022-05-20 10:45:34 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
Rucha Mahabal
7d4872aedd
patch: set payroll entry status
2022-05-19 20:35:56 +05:30
Ankush Menat
80d959c579
fix: dont fail repost for recoverable errors ( #30979 )
...
recoverable erros:
1. timeout
2. lock/deadlocks
2022-05-16 11:23:35 +05:30
Deepesh Garg
b13698a1d5
fix: Failing accounting dimension patch
...
(cherry picked from commit b14a7b8a5db2512f365efb75b9cc75ee3c3fa213)
2022-05-12 09:27:40 +00:00
Sagar Sharma
1a70701eca
fix: per_billed for return DN ( #30868 )
...
* fix: per_billed for return DN
* chore: move patch from v14 to v13
2022-05-11 16:49:28 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API ( #30864 )
...
* fix(minor): update frappe.error_log to new API
* refactor: changes for updated log_error api
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-05-02 15:04:26 +05:30
Ankush Menat
dcda55641b
fix: convert default_item_manufacturer to link field ( #30835 )
2022-05-02 13:58:22 +05:30
Ankush Menat
f0049da284
chore: correct link
2022-05-02 11:52:46 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration
2022-05-02 11:47:37 +05:30
Rushabh Mehta
be0f84a722
fix(minor): fix create_accounting_dimensions_in_orders.py
2022-05-02 09:41:12 +05:30
Deepesh Garg
fc09c90af7
Merge branch 'develop' into accounting_dimension_consistency
2022-05-01 22:02:10 +05:30
Rushabh Mehta
d746db5547
fix(minor): discount accounting patch
2022-05-01 12:25:21 +05:30
Deepesh Garg
f25251bb70
chore: Clean up patches
2022-04-29 12:42:29 +05:30
Deepesh Garg
3c578a3b0b
chore: Add patch to delete education doctypes
2022-04-28 19:54:28 +05:30
Deepesh Garg
60b693f84f
chore: clean up hooks
2022-04-28 12:02:54 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency
2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66
fix: Consistent accounting dimensions across Sales and Purchase docs
2022-04-26 14:01:13 +05:30
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account
2022-04-25 12:17:50 +05:30
Rucha Mahabal
9d158088ee
chore: remove unused Employee Transfer Property doctype
2022-04-22 20:20:12 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account
2022-04-21 15:06:58 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com
2022-04-21 12:32:33 +05:30
marination
6d750e185e
fix: Handle Multiselect field mapping separately
...
- Map Multiselect child table to Website Item (copy rows)
2022-04-20 17:40:03 +05:30
marination
5660b335ba
fix: Mistyped variable name in patch
2022-04-20 12:25:59 +05:30
Rucha Mahabal
7c547f152f
fix(patch): check if column is present while fixing reverse linking ( #30737 )
2022-04-19 12:18:46 +05:30
marination
d0cd194398
chore: Patch to copy custom fields (field filters) from Item to Website Item
2022-04-18 21:40:19 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account
2022-04-14 17:29:28 +05:30
rahib-hassan
0eff74c650
fix: tabspacing
2022-04-14 15:42:16 +05:30
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration ( #30584 )
...
The DATEV integration follows the trend and moves into a separate app.
- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
2022-04-13 09:24:19 +00:00
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account
2022-04-11 14:55:42 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-09 19:57:59 +05:30
rahib-hassan
dc2944a041
fix[minor]: removed doc assignment
2022-04-09 03:55:25 +05:30
rahib-hassan
ac16f3b71f
fix: lock timeout exceeded
2022-04-08 18:20:41 +05:30
rahib-hassan
ac7f1cbd87
fix: minor fix
2022-04-08 17:46:49 +05:30
rahib-hassan
35e875c111
fix(patch): enable discount account in buying and selling if exist in accounts settings
2022-04-08 17:27:53 +05:30
Ankush Menat
bb875fe217
fix: check null values in is_cancelled patch ( #30594 )
2022-04-06 14:20:39 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-06 10:00:51 +05:30
Deepesh Garg
a7e125a540
chore: format patch file
2022-04-02 20:36:36 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
Deepesh Garg
03952f8819
fix(India): Auto tax fetching based on GSTIN
...
(cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10)
# Conflicts:
# erpnext/patches.txt
# erpnext/regional/india/setup.py
# erpnext/selling/doctype/quotation/quotation.json
2022-03-29 04:56:49 +00:00
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Raffael Meyer
c01fe74cf0
fix(patch): fix failing patches ( #30427 )
...
* patch: reload Opportunity
* patch: reload child tables before doctype
2022-03-28 17:53:54 +05:30
Saqib Ansari
4766732b56
Merge branch 'develop' into fix-item-tax-template-patch
2022-03-26 11:48:41 +05:30
Rucha Mahabal
ffec9516fa
fix: do not update status to Paid if sanctioned amount is 0
2022-03-25 21:41:48 +05:30
Rucha Mahabal
0461223627
fix: Expense Claim conditions for Paid status
...
- status doesn't change to Paid if the entire required amount is already covered via linked advances
- status doesn't change to Paid if the claim is partially paid via advances
- patch to update such uncancelled claims to Paid
2022-03-25 21:41:48 +05:30
Saqib Ansari
936267c934
fix: move item tax to item tax template patch
2022-03-25 15:45:13 +05:30
Saqib Ansari
33863cd6ab
Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again
...
fix: multiple pos issues
2022-03-25 15:34:54 +05:30
Shadrak Gurupnor
c4854bb1b1
fix: failing broken patches ( #30409 )
...
* fix: failing broken patches
* refactor: simpler conditions
[skip ci]
2022-03-25 12:49:37 +05:30
Saqib Ansari
16253a2f72
fix: set is_return & return_against in POS Invoice Reference table
2022-03-25 10:51:30 +05:30
Deepesh Garg
972d06555a
fix: Add permission for KSA Vat documents
2022-03-18 17:32:46 +05:30
Rucha Mahabal
f090e63e54
test: fix holiday list creation causing flaky tests ( #30260 )
2022-03-17 15:21:56 +05:30
Sagar Vora
ceccacac1f
fix: restore inadvertently deleted patches
2022-03-17 13:43:13 +05:30
Rucha Mahabal
3218ccbb96
fix: Leave Policy Assignment creation patch ( #30215 )
2022-03-15 11:43:27 +05:30
Ankush Menat
d3e90ed8c8
fix(patch): remove dead links to ProdPlan Item
2022-03-14 14:15:43 +05:30
Deepesh Garg
60ba0ba219
Merge branch 'develop' into loan_cost_center
2022-03-13 12:50:27 +05:30
Deepesh Garg
5d66cc4c4a
fix: Add cost center in loan document
2022-03-10 12:22:37 +05:30
