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
Ankush Menat
bd3b47fd50
fix: remove stale doctypes and add msg for ecommerce refactor ( #27700 )
2022-02-03 14:06:31 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 10:45:14 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses ( #29451 )
...
* feat: Provisonal accounting for expenses
* fix: Method for provisional accounting entry
* chore: Add test case
* fix: Remove test case
* fix: Use company doctype
* fix: Add provisional expense account field in Purchase Receipt Item
* fix: Test case
* fix: Move provisional expense account to parent
* fix: Patch
2022-02-01 14:42:55 +05:30
marination
456f27724c
fix: Convert Item links to Website Item links in Item Card Group template data
...
- Changed link option to Website Item in Item card group template
- patch to convert pre-existing data
2022-02-01 11:02:48 +05:30
Marica
19e5dfbb7c
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-01 00:56:11 +05:30
Deepesh Garg
dcd99a82cb
Merge pull request #29536 from nabinhait/cost-center-allocation
...
feat: Cost Center Allocation
2022-01-31 21:27:15 +05:30
Ankush Menat
6cd7c47409
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-31 17:14:36 +05:30
rohitwaghchaure
f026ec6bad
Merge pull request #29522 from ankush/drop_bom_level
...
refactor!: dynamically compute bom_level
2022-01-31 15:58:25 +05:30
Ankush Menat
5aa1b6bc38
Merge pull request #29519 from ankush/unique_bin
...
fix: bin uniqueness
2022-01-31 14:29:22 +05:30
Nabin Hait
ce49e6ccf7
fix: Resolved conflicts in patches
2022-01-31 13:25:44 +05:30
Ankush Menat
157b4b33fe
refactor!: dynamically compute bom_level
2022-01-30 22:06:24 +05:30
Sagar Sharma
7ff3ca25e5
fix(patch): patch duplicate bins
2022-01-30 18:43:02 +05:30
Saqib Ansari
b8802a3315
fix: patch order
2022-01-29 18:31:55 +05:30
Saqib Ansari
04a28df170
fix: remove invalid patch
2022-01-29 12:40:25 +05:30
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing
2022-01-28 14:34:29 +05:30
Ankush Menat
e4c220053f
fix(patch): update BOMs to have correct transfer_material_against
2022-01-28 13:22:47 +05:30
Saqib Ansari
02af32dde6
fix: incorrect patch path
2022-01-28 10:17:16 +05:30
Saqib Ansari
c5782b0e71
revert: "refactor!: drop e-invoicing integration from erpnext ( #26940 )"
...
This reverts commit c335962827
2022-01-27 20:09:56 +05:30
Rucha Mahabal
6c1c85be0c
feat: additional doctypes access for ESS user ( #29317 )
2022-01-27 00:51:29 +05:30
Ankush Menat
7eab945d8c
refactor: move existing patches to post migration ( #28940 )
...
Also remove duplicates :')
2022-01-26 12:40:21 +05:30
Deepesh Garg
c68c70f8bc
feat: Refund entry against loans
2022-01-25 19:59:33 +05:30
ChillarAnand
7086d3f3d7
Merge branch 'develop' into remove-nonprofit
2022-01-24 11:35:47 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase
2022-01-21 15:33:13 +05:30
Ankush Menat
203f0086f8
fix(patch): update stock reconciliation current serial nos
...
When current serial nos are non-existing there shouldn't be any value in
current_serial_no field.
2022-01-21 15:27:10 +05:30
Saqib Ansari
eff1d6bf67
Merge branch 'develop' into grouped-asset-purchase
2022-01-21 14:20:47 +05:30
Saqib Ansari
a09259f175
Merge branch 'develop' into grouped-asset-purchase
2022-01-21 14:20:27 +05:30
Saqib Ansari
c3e890e59f
Merge branch 'develop' into fix-cancel-jv
2022-01-21 12:25:30 +05:30
Ankush Menat
cce35c1536
fix(patch): delete hospitality custom fields ( #29382 )
2022-01-20 19:42:08 +05:30
Chillar Anand
2718ddd784
refactor: Removed hospitality domain from ERPNext ( #29167 )
2022-01-20 11:57:22 +05:30
Saqib Ansari
04d64567ef
fix: cannot cancel jv after migrating from v12
2022-01-19 19:37:55 +05:30
Saqib Ansari
d36092d448
patch: set default asset quantity as 1
2022-01-19 18:27:19 +05:30
Marica
b9f70edacb
Merge pull request #28843 from noahjacob/maint_sch_link_fix
...
refactor: update_serial_no function for old Maintenance Visits
2022-01-19 12:49:11 +05:30
Rucha Mahabal
bf30932de0
patch: Employee Advance return statuses
2022-01-18 14:36:38 +05:30
Rucha Mahabal
b07c1f3bf1
feat: add link to leave application in leave notification ( #29316 )
2022-01-17 14:37:25 +05:30
Noah Jacob
d39ffeeef0
Merge branch 'develop' into maint_sch_link_fix
2022-01-17 10:34:07 +05:30
Ankush Menat
66bf21f143
fix(patch): sle.serial_no = "\n" causes incorrect queue ( #29306 )
...
This happens due to old data.
2022-01-16 20:45:59 +05:30
Deepesh Garg
3438e1f0c4
Merge pull request #29175 from rtdany10/patch-14
...
fix: seperate custom field creation for KSA
2022-01-15 20:52:57 +05:30
Saqib Ansari
203fca45bf
fix: order of company form fields ( #29287 )
2022-01-14 14:59:58 +05:30
Ankush Menat
c80d5f70bc
Merge branch 'develop' into maint_sch_link_fix
2022-01-12 19:46:52 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +05:30
Ankush Menat
f8119563ca
fix(patch): enable all uoms on recently created sites
2022-01-11 17:49:30 +05:30
Deepesh Garg
93d784dde3
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 21:28:53 +05:30
Deepesh Garg
3fdd47e71f
Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings
2022-01-10 17:32:15 +05:30
Deepesh Garg
e2dab6f421
fix: Cleanup and fixes
2022-01-10 17:31:38 +05:30
Ankush Menat
0faa116f97
fix(patch): serial no whitespace trimming
...
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.
2022-01-10 16:02:27 +05:30
Shadrak Gurupnor
25c875e447
chore: remove framework patch for custom fields ( #29117 )
...
* chore: patches were breaking during migration
* fix: rewrote the query in query builder
* chore: removed patch from patches.txt
2022-01-07 18:54:50 +05:30
Dany Robert
2e5f22a370
patch: run field creation patch
2022-01-07 13:01:19 +05:30
ChillarAnand
0c0a9ed96d
refactor: Remove non-profit domain from ERPNext
2022-01-06 09:53:49 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext ( #29022 )
2022-01-04 17:26:11 +05:30
Rucha Mahabal
3c8ed4f737
Merge branch 'develop' into multiple-cost-centers-against-employee
2021-12-28 08:40:48 +05:30
Deepesh Garg
3b9bea7937
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-28935
2021-12-26 10:25:52 +05:30
