Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,156 Commits 3 Branches 0 Tags 1 GiB
ac2e19103f
Commit Graph

3058 Commits

Author SHA1 Message Date
Nabin Hait
d71d3e3b3e fix: Minor issues in existing patches 2022-01-31 13:24:18 +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
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
mergify[bot]
f469ec87d9
fix: broken patches (backport #29067) (#29406) 
* chore: patch fixes

(cherry picked from commit 8b5b146f6d2720587a16f78a8d47840be8dca2b7)

# Conflicts:
#	erpnext/patches/v13_0/make_homepage_products_website_items.py

* fix: remove desktop icons while deleting sales reports

(cherry picked from commit 5f72026cb932d01fc827c382747e996a94b441fd)

* refactor: dont ignore dangerous exceptions in patches

(cherry picked from commit 0aa1ea8aeb7757592616bd491de98c69fef08854)

* fix: make patch kinda idempotent

with previous query rerunning would've caused all values to become 0.

* chore: conflicts

* fix: check type before patching

Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-25 11:14:08 +05:30
Ankush Menat
dc8dad4456 fix(patch): skip patch if column doesn't exist 2022-01-21 16:12:13 +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
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
Saqib Ansari
203fca45bf
fix: order of company form fields (#29287) 2022-01-14 14:59:58 +05:30
Chillar Anand
39eb4e040c
fix(healthcare): Remove custom fields related to healthcare (#29129) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-14 12:37:32 +05:30
Ankush Menat
c80d5f70bc
Merge branch 'develop' into maint_sch_link_fix 2022-01-12 19:46:52 +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
ca5ea5f55f fix: test cases 2022-01-10 21:28:29 +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
cbaa8fdade refactor: convert query to ORM 2022-01-10 16:13:52 +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
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Rohit Waghchaure
d9b9f4e8b7 fix: optimize patch for update bom in SO and MR 2021-12-29 10:14:03 +05:30
Rucha Mahabal
8226ea65c8 fix: linter issues 2021-12-28 08:54:05 +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
Raffael Meyer
52397c9771
fix: avoid "string" in None condition 2021-12-26 02:15:57 +01:00
Rucha Mahabal
6eeea0a77a
fix: ignore links while setting default notification templates in Settings (#29019) 2021-12-24 17:20:23 +05:30
Nabin Hait
f152a40b28 feat: Provision to assign multiple payroll cost centers against a single employee 2021-12-24 16:23:33 +05:30
Deepesh Garg
12a65eef8a fix: Is Reverse Charge check in Tax Category 
(cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010)

# Conflicts:
#	erpnext/patches.txt
 2021-12-21 08:12:08 +00:00
Saqib Ansari
564d23fa8d fix(ksa): enable ksa pos invoice print format 2021-12-16 11:19:03 +05:30
Noah Jacob
af2e95d192
Merge branch 'develop' into maint_sch_link_fix 2021-12-15 15:42:23 +05:30
Noah Jacob
c872aa43f8 fix(patch): updates maintenance schedule field for old docs 2021-12-15 15:27:41 +05:30
Deepesh Garg
6749d8e6c9
Merge pull request #28832 from deepeshgarg007/ksa_e_invoice_patch_fix 
fix: KSA QR field rename patch
 2021-12-14 12:47:58 +05:30
Saqib
7d0a3e4e8b
Merge pull request #28550 from nextchamp-saqib/fix-sla 
refactor(SLA): Application of SLA and its fields
 2021-12-13 10:29:56 +05:30
Rucha Mahabal
1867bad693
Merge branch 'develop' into exit-interview 2021-12-12 22:13:11 +05:30
Deepesh Garg
14d03a9446 fix: KSA QR field rename patch 2021-12-12 12:55:30 +05:30
Dany Robert
5b20746311
chore: switch to ORM method 2021-12-08 07:53:45 +05:30
Dany Robert
15373f1b2d
fix: intendation error 2021-12-07 18:34:34 +05:30