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

527 Commits

Author SHA1 Message Date
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
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
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
Deepesh Garg
82a0635c66 fix: Consistent accounting dimensions across Sales and Purchase docs 2022-04-26 14:01:13 +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
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
Deepesh Garg
a7e125a540 chore: format patch file 2022-04-02 20:36:36 +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
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
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
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
Sagar Vora
b90a134d91 fix: remove patches 2022-02-25 11:36:18 +05:30
Rucha Mahabal
761e528ba3
fix: deprecation warning 2022-02-24 17:57:39 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit 2022-02-24 17:03:52 +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
ChillarAnand
db1957ffe6 Merge branch 'develop' into remove-nonprofit 2022-02-17 13:00:58 +05:30
marination
06d36c6143 chore: Move patch that updates SO from WO to v13 2022-02-16 17:40:16 +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
325dc92d37 Merge branch 'develop' into remove-nonprofit 2022-02-03 16:38:01 +05:30
gavin
7eb9dc01f8 fix: Ignore mandatory fields if exist (#27871) 
The goal of this fix is to not break the patch in case of customizations
In this particular case, it's regarding a customized Note DocType with
multiple custom mandatory fields
 2022-02-03 14:08:32 +05:30
Ankush Menat
bd3b47fd50 fix: remove stale doctypes and add msg for ecommerce refactor (#27700) 2022-02-03 14:06:31 +05:30
marination
f97642e975 fix: Qb query, use isin instead of in and access fields without dot notation due to reserved pypika keywords 2022-02-03 14:03:17 +05:30
marination
4b62d2d7fe fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip 2022-02-02 12:58: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
45fadb5235 fix: Faulty 'continue' not setting value in db 2022-02-01 11:03:12 +05:30
marination
091a07c6df fix: Code cleanup 2022-02-01 11:03:05 +05:30
marination
31a2485bcd fix: Sider 2022-02-01 11:02:59 +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
marination
9fb61efba8 chore: Fix imports and formatting (linter) & Sider (unused import) 2022-02-01 00:54:54 +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
Ankush Menat
0a15334464 fix: update reserved qty for production/ s/c 2022-01-31 14:10:42 +05:30
Nabin Hait
d71d3e3b3e fix: Minor issues in existing patches 2022-01-31 13:24:18 +05:30
Ankush Menat
157b4b33fe refactor!: dynamically compute bom_level 2022-01-30 22:06:24 +05:30
Ankush Menat
c2ecc7a2d1 refactor: patch for fixing broken bins 
fix(patch): delete fully broken bins

if bin doesn't have item_code or warehouse then it's not recoverable.
 2022-01-30 18:43:02 +05:30
Sagar Sharma
7ff3ca25e5 fix(patch): patch duplicate bins 2022-01-30 18:43:02 +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
Deepesh Garg
c68c70f8bc feat: Refund entry against loans 2022-01-25 19:59:33 +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
ChillarAnand
7086d3f3d7 Merge branch 'develop' into remove-nonprofit 2022-01-24 11:35:47 +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
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
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
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
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
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
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
Rucha Mahabal
6eeea0a77a
fix: ignore links while setting default notification templates in Settings (#29019) 2021-12-24 17:20:23 +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