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

2564 Commits

Author SHA1 Message Date
Gursheen Kaur Anand
6280031722
Merge branch 'develop' into make-against-field-dynamic 2023-11-06 17:06:03 +05:30
s-aga-r
f70d779034
Merge pull request #37864 from s-aga-r/FIX-5139 
fix: permission error while creating Supplier Quotation from Portal
 2023-11-03 11:57:06 +05:30
s-aga-r
e019d43d0b fix: permission error while creating Supplier Quotation from Portal 2023-11-03 00:53:30 +05:30
Gursheen Kaur Anand
1b808e1d7c
fix: standard submit perm in repost ledger for editable invoices (#37826) 
* fix: ignore perm while reposting ledger

* fix: use flag in save

* fix: remove unnecessary save
 2023-11-02 14:01:26 +05:30
rohitwaghchaure
d91d9b02d4
Merge pull request #37849 from rohitwaghchaure/fixed-remove-voucher_type_no 
fix: remove voucher type and no for Item and Warehouse based reposting
 2023-11-02 13:26:44 +05:30
Rohit Waghchaure
0104897d69 fix: remove voucher type and no for Item and Warehouse based reposting 2023-11-02 13:24:56 +05:30
David Arnold
c78fdaae90
Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status 2023-10-30 17:25:08 +01:00
Gursheen Anand
d69b0d76dd fix: status for over delivery or billing 2023-10-25 13:59:37 +05:30
Deepesh Garg
11d956fa18
fix: Purchase Receipt GL Entries (#37642) 
* fix: Purchase Receipt GL Entries

* chore: cleanup

* test: set cwip account
 2023-10-24 14:28:19 +05:30
ruthra kumar
025acc0e48
Merge pull request #37630 from ruthra-kumar/provision_to_set_for_gain_loss_journal 
refactor: configurable exchange gain or loss posting date
 2023-10-23 21:25:48 +05:30
ruthra kumar
514d5434a3 test: varying posting date for gain loss journal 2023-10-23 12:32:10 +05:30
ruthra kumar
7e600a6494 refactor: pass gain loss posting date to controller 2023-10-23 12:12:59 +05:30
Deepesh Garg
d1ec0a6093
chore: Add missing commits back (#37618) 
* chore: Add missing commits back

* test: cwip accounting unit tests

* chore: Attribute error

* chore: Purchase Invoice tests

* chore: Missing asset account

* chore: Missing asset account

* chore: update tests

* fix: Internal transfer GL Entries
 2023-10-23 00:16:40 +05:30
rohitwaghchaure
5136fe196b
fix: remove from or target warehouse for non internal transfer entries (#37612) 2023-10-22 20:03:02 +05:30
Deepesh Garg
dae66eab36 Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 20:12:43 +05:30
Deepesh Garg
0b674b608b Merge branch 'develop' of https://github.com/frappe/erpnext into asset_purchase_receipt_gl 2023-10-20 16:50:52 +05:30
Smit Vora
77cc91d06b fix: add regional support to extend purchase gl entries 2023-10-19 22:35:55 +05:30
Ankush Menat
c197d37404 Merge branch 'develop' into e_com_perms 2023-10-17 22:29:44 +05:30
Ankush Menat
f4d74990fe fix: E-commerce permissions 2023-10-17 22:28:04 +05:30
Deepesh Garg
8c61fe2ca5 fix: rearrange functions 2023-10-17 20:36:09 +05:30
Ankush Menat
0931e93b4c
Merge pull request #37552 from frappe/addr_fetch 
fix: Ignore addr permission in internal code
 2023-10-17 20:00:44 +05:30
Ankush Menat
7b9cedebf6 fix: Ignore addr permission in internal code 2023-10-17 19:00:52 +05:30
Sabu Siyad
f900a78995
refactor!: drop ecommerce in favor of webshop (#33265) 
* refactor!: remove ecommerce item group field check

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

* refactor!: remove `e_commerce` directory

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

* refactor!: remove `get_context` from `item_group`

https://frappeframework.com/docs/v14/user/en/guides/portal-development/context

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

* refactor!: remove related `./templates`

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

* refactor!(navbar): remove wishlist (ecommerce)

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

* refactor!(js): remove js from scripts

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

* refactor!: remove `www/all-products`

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

* refactor!: remove pages and js

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

* refactor!: remove js/customer_reviews

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

* refactor!(portal utils): remove shopping cart debtor account

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

* refactor!: remove e_commerce events from hooks

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

* refactor!(web): remove e_commerce js from bundle

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

* refactor!(setup): remove shopping cart setup

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

* refactor!: remove pages

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

* refactor(item): remove website item button

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

* refactor!(payment request): remove `on_payment_authorized`

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

* refactor!: @staticmethod `get_gateway_details`

to avoid monkey patching, in custom apps
https://discuss.erpnext.com/t/how-to-override-method-in-frappe/28786/36

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

* refactor!(pages): remove product page

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

* refactor!(homepage): do not setup website items

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

* refactor(workspace): remove link to ecommerce settings

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

* refactor!(www): remove shop-by-category

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

* refactor!(homepage): remove featured product

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

* refactor: remove products in homepage

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

* refactor(homepage): remove explore button

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

* refactor: remove products fields from homepage

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

* Revert "refactor!: @staticmethod `get_gateway_details`"

This reverts commit 561bcd96680a930bb92627869502d9346b10611b.

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

* refactor!: remove payment gateway e_commerce import

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

* chore: pre-commit

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

* refactor!: pass `party` into `get_price`

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

* refactor: move `get_item_codes_by_attributes` to `utilities/product`

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

* refactor!(quotation): input customer group

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

* chore: pre-commit

* refactor: remove custom `navbar_items.html`

* refactor!(item): remove `published_in_website`

* refactor: move `validate_duplicate_website_item` before rename

* test: remove `test_shopping_cart_without_website_item`

* chore: add doctype drop patch

* refactor: removed website item related code

* refactor: removed shopping_cart code

* refactor: removed e-commerce related patches

* refactor: removed website related fields from item group

* fix: patch create_asset_depreciation_schedules_from_assets, KeyError: '0K BU64 AUY'

---------

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2023-10-17 17:05:44 +05:30
ruthra kumar
5bb3e290d2
Merge pull request #37330 from ruthra-kumar/provision_to_pick_exc_rate_on_transaction_date 
refactor: checkbox to toggle exchange rate inheritence in PO->PI
 2023-10-17 09:45:33 +05:30
David Arnold
8b21ca2db9
fixup! feat(payment): add advance payment status to advance payment doctypes to better track advance payments 2023-10-17 00:12:19 +02:00
ruthra kumar
08315522bb refactor: checkbox to toggle exchange rate inheritence in PO->PI 2023-10-16 16:25:19 +05:30
Deepesh Garg
621da178e1 Merge branch 'develop' of https://github.com/frappe/erpnext into rounded-row-wise-tax 2023-10-15 18:10:27 +05:30
Gursheen Anand
fed8cf4196 fix: test for reposting pi 2023-10-12 17:40:57 +05:30
Gursheen Anand
528ed9c986 fix: check child rows before update 2023-10-12 16:54:41 +05:30
Gursheen Anand
9ab55a5bd8 refactor: better abstraction for controller code 2023-10-12 12:48:14 +05:30
ruthra kumar
0cdd6435a5 refactor: add validation for Advances in SI/PI 2023-10-11 14:42:23 +05:30
Dany Robert
6a27cbd61d
Merge branch 'frappe:develop' into rounded-row-wise-tax 2023-10-11 12:31:13 +05:30
David Arnold
c809e61103
feat(payment): add advance payment status to advance payment doctypes to better track advance payments 2023-10-10 22:33:06 +02:00
mergify[bot]
10c666bf69
fix: incorrect status of the returned purchase receipt (backport #37300) (#37380) 
fix: incorrect status of the returned purchase receipt (#37300)

(cherry picked from commit 63f45739e05d728e8844320ff0c7dbafa8660acf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-06 14:43:13 +05:30
mergify[bot]
d2aa4d5d6b
fix: validation message for valuation rate (backport #37301) (#37351) 
fix: validation message for valuation rate (#37301)

(cherry picked from commit 643bb0511ce6b858d84613d08b551b7f15c6364a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-05 18:13:23 +05:30
Gursheen Anand
fcfdb9b566 fix: purchase receipt tests 2023-10-03 15:19:33 +05:30
vr-greycube
4ada5a488e
fix: Use default Cost Center of the Company for additional discount (#37234) 
fix: Set cost center as default company cost center 

When Discount Accounting in enabled in Selling Settings, use Company default Cost Center while making GL entries for additional_discount_account
 2023-09-27 10:38:32 +05:30
mergify[bot]
d558ba29fa
fix: serial number decimal issue (backport #37242) (#37250) 
fix: serial number decimal issue (#37242)

(cherry picked from commit 78ab2013e59bb6a95d10164328ad3f7c815497b5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-26 17:55:16 +05:30
ruthra kumar
ed7f67b1a8 refactor: remove references in repost doctypes upon parent doc delet 2023-09-26 14:35:31 +05:30
Gursheen Anand
4ea43ebc5d fix: set against type in stock controller 2023-09-25 20:01:13 +05:30
Gursheen Anand
4c5a83d6cf fix: set against type in controllers 2023-09-25 19:55:40 +05:30
Gursheen Anand
7ebf083683 refactor: use repost accounting legder 2023-09-23 19:13:33 +05:30
Gursheen Anand
68effd93bd refactor: move reposting logic to common controller 2023-09-21 17:28:07 +05:30
rohitwaghchaure
dd4769ecf1
feat: allow to edit Stock Quantity in the Sales and Purchase Transactions (#36600) 
feat: allow to edit Stock Quantity in the Sales and Purchase transactions
 2023-09-20 18:09:03 +05:30
Smit Vora
3e282bfbce
chore: add regional support for getting payment entries (#37119) 
chore: add regional support for get payment entries
 2023-09-19 20:47:21 +05:30
RitvikSardana
03f0abf6de
fix: after applying coupon code, field in_words not updated (#37133) 
* fix: after applying coupon code, field in_words not updated

* fix: changed the order of the function set_total_in_words
 2023-09-19 13:08:17 +05:30
ruthra kumar
097b9892dc fix: asset validation misfire on debit notes 2023-09-15 17:54:20 +05:30
ruthra kumar
85ebaa3aed
Merge pull request #36879 from ruthra-kumar/unreconcile_feature 
feat: Unreconcile Payments
 2023-09-14 12:17:46 +05:30
RitvikSardana
d2f03c8a65
fix: payment recon not showing payment entry when party_type is Student (#36920) 
* fix: payment recon not showing payment entry when party_type is Student

* chore: code cleanup

* fix: payment recon based on account_type which is fetched from Party Type master
 2023-09-05 12:00:54 +05:30
ruthra kumar
9a1588f1cc fix: typo in doctype name and qb 2023-09-05 08:34:26 +05:30