niralisatapara
2ca0cf6fc4
feat: item wise tds calculation
2022-11-02 12:19:51 +05:30
Deepesh Garg
4b828dd276
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types
2022-10-08 18:41:39 +05:30
Nabin Hait
fe891aa488
fix: Create accounting dimension fields in asset capitalization
2022-09-30 15:55:41 +05:30
Deepesh Garg
679b5ed551
chore: Add patch to update repayment schedule type in loan documents
2022-09-30 14:06:06 +05:30
Deepesh Garg
51c37aeee3
Merge branch 'develop' into lead-notes-patch
2022-09-13 09:42:07 +05:30
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries
2022-09-07 14:55:56 +05:30
Nabin Hait
3abd00f3bb
fix: Migrate old lead notes as per the new format
2022-09-05 18:10:53 +05:30
ruthra kumar
d522f13d55
chore: add remarks migration to patches.txt
2022-08-29 15:59:56 +05:30
Sagar Sharma
e888639c7e
fix: Subcontracting Receipt GL Entries
2022-08-22 10:48:21 +05:30
Sagar Sharma
8704ca783d
fix: Add dimension section in subcontracting doctypes ( #31849 )
2022-08-18 10:58:33 +05:30
Nabin Hait
909945c0ac
fix: map old data as per new options of no-of-employees
2022-08-09 20:47:18 +05:30
ruthra kumar
80f508c4b1
chore: patch for creating existing dimensions in asset repair
2022-08-05 15:22:38 +05:30
Sagar Vora
bf2833b8ee
fix: ensure defaults removed in bad frappe patch get set again ( #31659 )
2022-07-21 13:32:03 +05:30
Rucha Mahabal
8b67d627d8
fix(patch): Remove missed records for HR & Payroll separation ( #31646 )
...
* fix(patch): delete HR Payroll custom fields from core
* fix: delete HR Payroll dashboard chart, number card, web forms
2022-07-20 18:56:37 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Nabin Hait
6c29146c91
fix: Removed 'Allow Monthly Depreciation' checkbox
2022-07-20 14:27:06 +05:30
Rucha Mahabal
8ce526115d
patch: Add HR & Payroll deprecation warning
2022-07-19 13:19:34 +05:30
Rucha Mahabal
2ae48fbdd4
Merge branch 'develop' into hr-separation
2022-07-18 10:58:22 +05:30
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
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +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
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +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
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
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
Sagar Vora
2e6919b7be
fix: remove more India patches
2022-06-24 14:14:12 +05:30
s-aga-r
f6ef3068d7
Merge branch 'develop' into subcontracting
2022-06-20 23:10:31 +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
276267d5a6
fix: remove agriculture module from patch ( #31369 )
2022-06-15 15:26:05 +05:30
ruthra kumar
538faf3639
chore: add gl to payment ledger migarion to patches
2022-06-15 13:17:06 +05:30
Ankush Menat
ee5bc58e9b
fix(job card): only hold during draft state ( #31243 )
2022-06-06 16:27:25 +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
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 ( #31118 )
2022-05-25 11:34:25 +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
Ankush Menat
86df7f835a
fix: move healthcare patch to post_model_sync ( #31008 )
...
[skip ci]
2022-05-13 18:15:34 +05:30
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
Ankush Menat
dcda55641b
fix: convert default_item_manufacturer to link field ( #30835 )
2022-05-02 13:58:22 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration
2022-05-02 11:47:37 +05:30
Deepesh Garg
3c578a3b0b
chore: Add patch to delete education doctypes
2022-04-28 19:54:28 +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
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
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
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
rahib-hassan
a7a5742375
fix: merge conflict(patch)
2022-04-11 14:28:36 +05:30
rahib-hassan
2173c8b114
fix(pathces): added to patches.txt
2022-04-08 17:29:08 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385
2022-04-06 10:00:51 +05:30
Ankush Menat
cf5f37e6d8
refactor: move schema change patch higher up
2022-04-04 12:15:26 +05:30
Deepesh Garg
485f5cfdfe
fix: Resolve conflicts
2022-04-02 17:25:29 +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
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
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
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again
2022-03-25 10:52:08 +05:30
Saqib Ansari
16253a2f72
fix: set is_return & return_against in POS Invoice Reference table
2022-03-25 10:51:30 +05:30
Ankush Menat
5b1d6055e6
fix: subassembly items linked to temporary name
...
Production Plan tables for po_items and sub_assembly_items are prepared
client side so both dont exist at time of first save or modifying and
hence any "links" created are invalid. This change retains temporary
name so it can be relinked server side after naming is performed.
Co-Authored-By: Marica <maricadsouza221197@gmail.com>
2022-03-24 15:00:05 +05:30
Deepesh Garg
972d06555a
fix: Add permission for KSA Vat documents
2022-03-18 17:32:46 +05:30
Sagar Vora
ceccacac1f
fix: restore inadvertently deleted patches
2022-03-17 13:43:13 +05:30
Ankush Menat
d3e90ed8c8
fix(patch): remove dead links to ProdPlan Item
2022-03-14 14:15:43 +05:30
Deepesh Garg
5d66cc4c4a
fix: Add cost center in loan document
2022-03-10 12:22:37 +05:30
Sagar Vora
3d45f3a6a8
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-03-03 10:20:50 +05:30
Rucha Mahabal
650099ee65
Merge branch 'develop' into emp-adv-status
2022-03-01 20:30:58 +05:30
Sagar Vora
b90a134d91
fix: remove patches
2022-02-25 11:36:18 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit
2022-02-24 17:03:52 +05:30
Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +05:30
18alantom
f4af75f60b
feat: batchwise valuation flag
...
This is required to avoid breaking behaviour in valuation
of old batches
2022-02-21 18:02:40 +05:30
Deepesh Garg
b7c388976d
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 16:58:52 +05:30
Deepesh Garg
a0bdcbd0cd
fix: Add patch for account fields
2022-02-21 11:44:00 +05:30
Deepesh Garg
e1f8f034c2
Merge branch 'develop' of https://github.com/frappe/erpnext into patch_fixes
2022-02-17 23:20:29 +05:30
Deepesh Garg
3a966d4dbe
fix: Move patch to post sync
2022-02-17 23:18:07 +05:30
ChillarAnand
db1957ffe6
Merge branch 'develop' into remove-nonprofit
2022-02-17 13:00:58 +05:30
ChillarAnand
b5ff9b27bd
refactor: Clean up non-profit setup
2022-02-17 12:37:25 +05:30
marination
06d36c6143
chore: Move patch that updates SO from WO to v13
2022-02-16 17:40:16 +05:30
marination
0ca58d7627
chore: Patch to update SO work_order_qty and Linter fix
2022-02-15 14:28:00 +05:30
Sagar Sharma
19a6c21eec
refactor!: amazon mws integration ( #29438 )
...
* remove: amazon mws integration
* add patch to remove doctype
* remove old patch
2022-02-14 19:43:26 +05:30
Ankush Menat
89959976bd
fix: patch existing bins
2022-02-09 12:21:05 +05:30
Deepesh Garg
8d7331de8f
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_refund_jv
2022-02-07 12:49:34 +05:30
ChillarAnand
dddeef7179
chore: Clean up whitespace
2022-02-03 16:41:36 +05:30
ChillarAnand
325dc92d37
Merge branch 'develop' into remove-nonprofit
2022-02-03 16:38:01 +05:30
