Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,905 Commits 3 Branches 0 Tags 1 GiB
9ee13ba86b
Commit Graph

1819 Commits

Author SHA1 Message Date
marination
22f41a17b7 chore: Removed Shopping Cart Module 
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
 2021-10-12 16:54:11 +05:30
marination
025574d9b5 chore: Removing Item's Website section & references 
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
 2021-10-12 16:03:19 +05:30
mergify[bot]
233bf5dd29
fix: using DN for transfer w/o internal customer (backport #27798) (backport #27805) (#27807) 
* fix: using DN for transfer w/o internal customer (backport #27798) (#27805)

* fix: using DN for transfer w/o internal customer (#27798)

This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.

(cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e)

* fix(ux): use toast instead of popup

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* fix: resolve conflict

* fix: resolve conflicts

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-10-05 16:16:21 +05:30
ChillarAnand
a1d3a09d3c Merge branch 'develop' into care 2021-10-04 09:46:34 +05:30
Saqib
e8ff649298
Merge branch 'develop' into fix-32644 2021-09-26 17:07:46 +05:30
Saqib Ansari
78ad50efc2 fix: cost center in exchange gain loss gl entry 2021-09-26 16:08:15 +05:30
Saqib Ansari
64efe8bf15 fix: setting of gain/loss if party account is in company currency 2021-09-26 15:46:13 +05:30
Sagar Vora
c8b9a55e96
feat: add Partly Paid status in Invoices (#27625) 2021-09-22 12:11:35 +05:30
Ankush Menat
21a955d20b
fix(ux): better error message 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-09-20 17:14:35 +05:30
Ankush Menat
5e4fbba753
refactor: add guard clause in for loop 
Reduce overly indented code/improve readability.
 2021-09-20 16:40:51 +05:30
Ankush Menat
43bf82b58b
fix: warn when overbilling checks are skipped. 2021-09-20 16:31:20 +05:30
Ankush Menat
648b2d72a5
perf: extract loop invariant db calls 2021-09-20 15:27:12 +05:30
DeeMysterio
aa82624f31
Merge pull request #27281 from DeeMysterio/party-specific-items 
feat: link items to supplier / customer
 2021-09-14 13:58:18 +05:30
Shariq Ansari
9aa6f52edd
fix: Webform Permission for custom doctype (#26232) 
* fix: Webform Permission for custom doctype

* fix: sider fix

* fix: app check condition for getting correct list_context

* chore: Better naming convention

* test: Added test case to check permission for webform of custom doctype

* chore: linting issue

* chore: linting issue

* fix: sider fix

* test: minor changes

* chore: linter and better naming method

* chore: linter fix

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-09-14 12:49:08 +05:30
Ankush Menat
62fc544280
test: basic tests for controllers/queries (#27422) 2021-09-10 12:46:35 +05:30
ChillarAnand
c8565c7090 chore: Removed healthcare module code in other modules 2021-09-06 20:47:27 +05:30
ChillarAnand
e913e277d9 chore: Rename imports from erpnext to healthcare 2021-09-02 19:47:39 +05:30
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes 2021-09-01 16:57:21 +05:30
Ankush Menat
55b24345a0
fix: remove unused format from query 
doctype is not used in query and parent alone is enough to identify
packed items.
 2021-09-01 15:33:37 +05:30
Frappe PR Bot
81fb493850
fix: payment terms on Sales Order when Invoice Portion field is empty (#27259) 2021-08-31 19:01:03 +05:30
Anuja Pawar
3e404f15ff
refactor: payment reconciliation tool (#27128) 2021-08-31 18:59:29 +05:30
Rucha Mahabal
71b7c63ec0
feat: Ability to schedule onboarding and separation activities (#26738) 
* refactor: employee onboarding form clean-up

* feat: ability to schedule onboarding / separation tasks

* feat: skip holidays while setting boarding activity dates

* chore: remove unused child table - Employee Onboarding Activity

* fix: tests

* fix: employee separation test
 2021-08-27 11:12:24 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) 
* fix: Dont create inward SLE against SI unless is internal customer enabled

- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal

* test: Use internal customer for delivery of bundle items to target warehouse

- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
 2021-08-26 13:12:51 +05:30
Deepesh Garg
e2af9d5761
Merge pull request #27039 from nextchamp-saqib/common-party-acc 
feat: common party accounting
 2021-08-26 12:58:59 +05:30
rohitwaghchaure
fe4540d74d
fix: allow to change rate manually in case of stand-alone credit note (#27036) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-26 12:52:36 +05:30
Saqib Ansari
c6c7a8b5cf fix: cost center & naming series 2021-08-25 20:17:04 +05:30
Saqib Ansari
7254368fc5 perf: reduce number of queries to get party link 2021-08-25 20:15:23 +05:30
Saqib Ansari
881301ca9b Merge branch 'develop' of https://github.com/frappe/erpnext into common-party-acc 2021-08-25 20:02:27 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction (#27109) 2021-08-25 16:25:51 +05:30
Pruthvi Patel
7c957d72b3
perf: reduce number of queries to validate selling price (#26225) 
* perf: reduce number of queries to validate selling price

* fix: improved flow and formatting

* fix: improve condition and use of `as_dict`

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-08-24 21:24:25 +05:30
Nabin Hait
b99a8cb96e
Merge pull request #27087 from deepeshgarg007/validate_due_date_fix 
fix: Ignore due date validations if payment terms are copied from orders/receipts
 2021-08-24 21:10:44 +05:30
Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc 2021-08-24 17:27:43 +05:30
Subin Tom
2e5525aba9
fix: Correct price list rate value in return si (#27097) 2021-08-24 17:24:41 +05:30
Ankush Menat
6de7b8ea93
fix: discard empty rows from update items (#27021) 2021-08-24 12:18:40 +05:30
Deepesh Garg
bd709f8ab0 fix: Ignore due date validations if payment terms are copied from orders/receipts 2021-08-23 19:05:52 +05:30
Subin Tom
7d627df4db
fix: pos return payment mode issue (#26872) 2021-08-23 11:05:07 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc 2021-08-20 20:42:50 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
Saqib Ansari
977b09b6ba feat: auto create advance entry on invoice submission 2021-08-19 18:09:35 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Frappe PR Bot
44434ff70f
fix: date_unchanged calculation in "Update Items" (#26992) (#27011) 
Branch corrected https://github.com/frappe/erpnext/pull/26058

  ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
  "date_unchanged" variable gets false value because of new_date is string.

  "getdate(new_date)" corrects the date comparison.

  ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)

(cherry picked from commit d8a7abcd02f674bf6c4270a817ae9762a0b57140)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
 2021-08-18 18:33:06 +05:30
Subin Tom
333e44eb47
fix: Dimension filter query fix to avoid including disabled dimensions (#26988) 
* reverting ot v12.7.1

* fix: Dimension filter query fix to not display disabled dimensions

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 16:17:54 +05:30
Sagar Vora
d932cba38a
Merge pull request #26976 from resilient-tech/fix-incorrect-modified 
fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`
 2021-08-17 13:17:09 +05:30
Deepesh Garg
5122948450 Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting 2021-08-13 16:00:20 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Deepesh Garg
bff3b0962a fix: Override template only if setting is enabled 2021-08-10 23:58:27 +05:30
Afshan
b614834efe
fix: unseting of payment if no pos profile found (#26884) 2021-08-10 21:33:58 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929) 2021-08-10 17:26:35 +05:30
Marica
f6ea00e029
Merge branch 'develop' into serial-no-space 2021-08-10 13:17:08 +05:30