Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,517 Commits 3 Branches 0 Tags 1 GiB
301092dad1
Commit Graph

334 Commits

Author SHA1 Message Date
s-aga-r
328ba4b656 refactor!: remove woocommerce 2023-09-13 11:50:04 +05:30
Ankush Menat
4856e11549 chore: update integrations workspace 2023-08-29 15:51:40 +05:30
s-aga-r
91927f2ada
chore: woocommerce linter issue (#36837) 2023-08-28 00:21:51 +05:30
L Mwangi
3f077479f4
fix: On woocommerce test ping issued during a webhook creation 
fix: On woocommerce test ping issued during a webhook creation
 2023-08-26 19:45:55 +05:30
Kevin Shenk
43f530b077
fix: Plaid Integration status and categories 
"pending" is a boolean not a string, and "category" doesn't exist in some edge cases
 2023-08-15 13:34:59 -04:00
Deepesh Garg
0d70ae2a21 chore: Ingnore issues 2023-07-23 19:34:08 +05:30
Ankush Menat
41b6b739c0 fix: touch modified to migrate 2023-07-14 17:39:25 +05:30
Suraj Shetty
23bc87f2aa Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2023-07-14 16:21:48 +05:30
Deepesh Garg
ddbd7d8bbc
Merge pull request #35591 from resilient-tech/remove-whitelisting 
chore: remove whitelisting for methods not accessed from UI
 2023-06-20 20:29:49 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value (#35668) 
I just applied semgrep autofix. Untested completed, review before merging.

```yaml
- id: frappe-set-value-semantics
  patterns:
    - pattern-either:
      - pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
      - pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
  fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
  message: |
    If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
  languages: [python]
  severity: ERROR
```
 2023-06-13 17:30:38 +05:30
DaizyModi
5155d5bfb2 chore: remove whitelisting for methods not accessed from UI 2023-06-07 12:05:17 +05:30
Nabin Hait
243c49c550 refactor: Workspace cleanup 2023-05-30 13:17:59 +05:30
Suraj Shetty
a0131a96cb Merge remote-tracking branch 'upstream/develop' into move-exotel-to-separate-app 2023-04-30 12:43:18 +05:30
Richard Case
ddb17a8880
fix: plaid log_error syntax issue (#34642) 2023-03-30 16:45:56 +05:30
Suraj Shetty
64f439600b Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2023-02-25 13:34:23 +05:30
Richard Case
5b7d23de15
feat: bank reconciliation and plaid changes (#33986) 
fix: plaid link refresh: update account ids
fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist
fix: bank reconciliation amount matching
fix: bank reconciliation dialog usability
feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance
fix: matching transaction amounts and race condition bug
fix: ensure there is a reference number in plaid transactions and other tweaks
feat: add references to Payroll Entry Bank Journal Entry
feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions
fix: strange type error
feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields
feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments
fix: bank transaction self-reconcile bug and tidy
fix: bank reconciliation datatable index update
 2023-02-19 11:50:17 +05:30
Sabu Siyad
8e271fd719
feat(exotel): make use of CustomField in API (#33338) 
* feat(exotel): pass kwargs for `make_a_call`

https://developer.exotel.com/api/make-a-call-api#call-agent

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* feat(exotel): map custom field to doctype

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-12-28 08:11:28 +05:30
Ankush Menat
0b86b1baca
refactor: make payments app a soft dependency (#33245) 
refactor: make payment app a soft dependency
 2022-12-08 16:40:13 +05:30
Deepesh Garg
1100816d7a refactor!: Move TaxJar integration from ERPNext 2022-11-21 20:18:06 +05:30
gavin
dd2493a541
fix(realtime): Restrict updates to only last modified or current user (#33034) 2022-11-18 17:17:54 +05:30
Sabu Siyad
546c809cbe
fix: use list() on self mutating iteration 
https://github.com/frappe/erpnext/issues/30325

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-17 17:46:49 +05:30
Suraj Shetty
122f1c0ced
fix: Explicitly commit "log_error" since its getting called during GET request (#31952) 2022-08-24 18:24:39 +05:30
Sagar Vora
aafb735283
perf: use create_custom_fields (#31853) 
* perf: use `create_custom_fields`

* fix: default must be a string
 2022-08-18 21:01:20 +05:30
Suraj Shetty
6349f29aed fix: Remove option from Communication Medium 2022-07-30 14:26:37 +05:30
Suraj Shetty
45544c2b1e Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2022-07-28 10:07:40 +05:30
phot0n
0048bcb067 chore: fix linter 2022-07-27 12:34:52 +05:30
phot0n
ef14da21bc fix: payment utils import paths 
Since we're splitting payments app from frappe, updating
ERPnext paths as well
 2022-07-25 10:38:09 +05:30
Suraj Shetty
3593573ed2 Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2022-07-22 12:24:20 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
Ankush Menat
3a3d13622d
refactor!: drop github connector from ERPNext (#31316) 2022-06-10 14:01:41 +05:30
Suraj Shetty
ec1607e825 Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2022-05-08 16:10:55 +05:30
Suraj Shetty
53e4fee4db refactor: Remove exotel 
Move it to separate app
 2022-05-08 16:04:14 +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
Suraj Shetty
39abfae5fe chore: Remove unused code 
- and simplify get_call_log
 2022-04-04 07:28:41 +05:30
Ankush Menat
7ef54809be Merge branch 'develop' into exotel-fixes 2022-03-28 19:55:39 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Subin Tom
5b79496f05 fix: call type doctype, fixes 2022-02-25 16:52:25 +05:30
Subin Tom
00b0f10100 fix: added type of call select field, additional status for agent rejecting call 2022-02-25 13:38:57 +05:30
Ankush Menat
9c7df2eec5 fix: ignore duplicates explicitly 2022-02-23 14:27:45 +05:30
Subin Tom
8d3011832b fix: call status fix 2022-02-23 12:59:38 +05:30
Subin Tom
1682a26fe6 fix: Taxjar minor fixes 2022-02-22 17:20:48 +05:30
Kenneth Sequeira
a26183e205
fix: add supported currencies (#29805) 2022-02-16 13:02:36 +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
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Ankush Menat
b05287dea0
fix: drop six code (#29479) 2022-01-27 20:08:05 +05:30
Shariq Ansari
bc187c121a fix: updated standard workspace json files 2022-01-13 19:24:11 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Shariq Ansari
9c4455f77c
fix: Removed ERPNext Integration Settings Workspace (#29023) 2021-12-24 18:52:35 +05:30
Ankush Menat
a388096c03
Merge pull request #28839 from ankush/migration_hashes 
fix: remove migration hashes from doctypes
 2021-12-13 11:27:27 +05:30
Subin Tom
ecc5de6159 fix: removing db call for variables 2021-12-01 11:54:59 +05:30