Commit Graph

37312 Commits

Author SHA1 Message Date
marination
d3702947b8 fix: Sider and CI
- Incorrect path and Settings in price_list.py import due to merge
- Extra space removed in website_item.py
- Changed client side namespace to `erpnext.e_commerce.*`
2021-08-26 20:58:13 +05:30
marination
06a6fd512a Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor 2021-08-26 16:53:59 +05:30
Marica
6ed52799d7 Merge pull request #27166 from frappe-pr-bot/backport/version-13-hotfix/27086
fix: Don't create inward SLE against SI unless is internal customer enabled
2021-08-26 16:43:14 +05:30
marination
614ee71778 fix: internal customer util returns 'str' not doc object 2021-08-26 16:22:35 +05:30
Marica
6e136c4377 Merge pull request #26151 from 18alantom/feat-bom-process-loss
feat: add provision for process loss in manufac
2021-08-26 16:11:58 +05:30
Marica
8db44189b6 Merge branch 'version-13-hotfix' into feat-bom-process-loss 2021-08-26 16:11:24 +05:30
Marica
57972cab48 Merge branch 'version-13-hotfix' into backport/version-13-hotfix/27086 2021-08-26 15:55:48 +05:30
marination
55ff6277a7 fix: Merge conflicts and place internal customer creation util in test_customer.py 2021-08-26 15:42:23 +05:30
Frappe PR Bot
d12fe79494 fix: Fee Validity fixes (#27161)
* fix: Fee Validity fixes (#27156)

* chore: update Fee Validity form labels

* fix: first appointment should not be considered for Fee Validity

* fix: Fee Validity test cases

* fix: appointment test case

(cherry picked from commit 642b4c805c)

* fix: overlapping appointments

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-26 14:59:21 +05:30
Frappe PR Bot
c3b1376517 fix: allow to change incoming rate manually in case of stand-alone credit note (#27164)
* fix: allow to change rate manually in case of stand-alone credit note (#27036)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit fe4540d74d)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: resolve conflicts

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-26 14:36:42 +05:30
Saqib
58dca11cae Merge pull request #27165 from nextchamp-saqib/common-party-acc-v13
feat: common party accounting
2021-08-26 13:47:58 +05:30
Frappe PR Bot
ed617d0939 fix(regional): minor fixes and test for South Africa VAT report (#26933) (#27162) 2021-08-26 13:27:39 +05:30
18alantom
f7f573b11b fix: prevent over riding scrap table values, name kwargs, set currency 2021-08-26 13:19:10 +05:30
Marica
6636d857f7 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

(cherry picked from commit f4dc9ee2aa)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
2021-08-26 07:47:13 +00:00
18alantom
466ff46045 Merge branch 'version-13-hotfix' into feat-bom-process-loss 2021-08-26 13:16:43 +05:30
Saqib Ansari
abde7fc085 fix: cost center in test_sales_invoice_against_supplier 2021-08-26 13:04:49 +05:30
Saqib Ansari
970e5af051 fix: cost center & naming series 2021-08-26 13:04:38 +05:30
Saqib Ansari
fb6af0481c perf: reduce number of queries to get party link 2021-08-26 13:04:31 +05:30
Saqib Ansari
e0649c132e fix: party link permissions 2021-08-26 13:04:24 +05:30
Saqib Ansari
f5afd51fa4 feat: validate multiple links 2021-08-26 13:04:13 +05:30
Saqib Ansari
a87139e16a fix: remove unwanted filter query 2021-08-26 13:02:08 +05:30
Saqib Ansari
da54f0a583 test: creation of advance entry on invoice submission 2021-08-26 13:02:05 +05:30
Saqib Ansari
2cb8cc525c feat: auto create advance entry on invoice submission 2021-08-26 13:01:21 +05:30
Saqib Ansari
fb94726d26 feat: toggle to enable common party accounting 2021-08-26 13:01:19 +05:30
Saqib Ansari
5a06618280 feat: initialize party link for customer & suppliers 2021-08-26 13:00:22 +05:30
Marica
16fbee30a6 fix: Shopping cart Exchange rate validation (#27050)
* fix: Shopping cart Exchange rate validation

- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed

* chore: Comment out obsolete test

- Modifying this test means considering extreme edge cases, which seems pointless now

* fix: Remove snippet that got in due to cherry-pick from `develop`

- This snippet is not present in v13-hotfix. Via https://github.com/frappe/erpnext/pull/26520

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 12:23:52 +05:30
Frappe PR Bot
6609321399 fix: removing toggle_display for address and contact HTML (#27152) (#27155)
(cherry picked from commit c8f22e5524)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
2021-08-26 11:02:01 +05:30
Frappe PR Bot
7f27586cbe fix(healthcare): Removed ignore user permissions flag in appointment (#27146)
* fix(healthcare): Removed ignore user permissions flag in appointment (#27129)

(cherry picked from commit 81b28b8998)

# Conflicts:
#	erpnext/healthcare/doctype/patient_appointment/test_patient_appointment.py

* chore: Fix merge conflicts

Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
2021-08-25 22:26:09 +05:30
Frappe PR Bot
4837d8872e fix: unable to create manual / auto asset depreciation entry when cost_center is mandatory (#26912) (#27149)
Summary : unable to create manual / auto asset depreciation entry when cost_center is mandatory

Reason: Though we are calculating value for depreciation_cost_center, it is not passed in credit_entry(it is passed in debit_entry) and this prevents creation of manual / auto asset depreciation entry when cost_center is mandatory

Solution : pass already calculated depreciation_cost_center value in credit_entry (in line with, already done as in debit_entry)
(cherry picked from commit b99c011947)

Co-authored-by: Ashish Shah <mr.ashish.shah@gmail.com>
2021-08-25 22:25:29 +05:30
Nabin Hait
014df08e7b Merge branch 'alyf-de-datev_more_info' into version-13-hotfix 2021-08-25 21:23:45 +05:30
Nabin Hait
09fb90b8ac fix: merge conflict 2021-08-25 21:23:24 +05:30
Dany Robert
7b9a23eb7a feat: Increase number of supported currency exchanges (#26763)
* fix: update test suite to accodomate new currency exchange function

* feat: Increase number of supported currency exchanges

* fix: don't make api call when testing

* remove condition for test(being fixed in another pull request)
2021-08-25 21:15:44 +05:30
Frappe PR Bot
0fe6995816 fix: sequence of sub-operations in job card (#27138) (#27147)
(cherry picked from commit ad45ddcabe)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-08-25 20:11:23 +05:30
Frappe PR Bot
f8ec0b6a86 feat: provision to create customer from opportunity (#27145)
* feat: provision to create customer from opportunity (#27141)

* feat: provision to create customer from opportunity

* fead: linking of address and contact

* revert: create_opportunity_address_contact

* enabming print hide and no copy

(cherry picked from commit 4d98be2126)

# Conflicts:
#	erpnext/crm/doctype/opportunity/opportunity.js

* Update opportunity.js

* fix: conflicts

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-08-25 20:05:54 +05:30
18alantom
c703ce1c61 fix: get filters to work
- reorder and rename columns
- add work order filter
2021-08-25 19:01:35 +05:30
Frappe PR Bot
4c3034ad79 fix: remove VARCHARs from Sales Invoice (#27136) (#27139)
Sales Invoice doctype is starting to hit row length limit as many
integrations add custom fields on this doctype. This is just a small
change to remove VARCHAR(140) fields and reduce row size wherever
possible.

(cherry picked from commit 8d116fb9ff)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-25 17:47:51 +05:30
Alan
1be810479c refactor: update stock module onboarding (#25745)
* refactor: update stock onboarding

* refactor: add form tour for stock module onboarding

* refactor: move trailing whitespace out of translate func

* refactor: sider/semgrep

* refactor: remove DN, PR; change wording, add/remove steps in tour

* refactor: add watch video step for stock opening balance

* refactor: reorder steps according to stock settings refactor

* refactor: fix typo, remove target warehouse cause SE Type dependency

* fix: semgrep, remove trailing and leading whitespaces

* refactor: reduce steps, reword cards

* fix: minor changes

- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight

* refactor: use Form Tour doc instead of controller form tour

note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings

* fix: rename form tours to doctype names, remove tours from js controllers

* fix: re-order tour to circumvent glitchy save highlight
2021-08-25 17:45:55 +05:30
Frappe PR Bot
d97a87e28d fix(healthcare): Made payment fields mandatory for new appointments (#27135)
* fix(healthcare): Made payment fields mandatory for new appointments (#26608)

* fix(healthcare): Made payment fields mandatory for new appointments

* fix: sider issues

* fix: Fix failing test

* fix: Patient appointment invoicing

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
(cherry picked from commit a65498dc61)

# Conflicts:
#	erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
#	erpnext/healthcare/doctype/patient_appointment/test_patient_appointment.py

* chore: Fix merge conflicts

* chore: Fix failing tests

Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
2021-08-25 17:12:04 +05:30
Frappe PR Bot
7ac4916191 feat: unreconcile on cancellation of bank transaction (#27109) (#27137) 2021-08-25 16:59:03 +05:30
Deepesh Garg
4eb7c2a011 fix: TDS calculation on net total (#27058) 2021-08-25 16:54:45 +05:30
Marica
dc6a8863e9 Merge branch 'version-13-hotfix' into e-commerce-refactor 2021-08-25 14:35:06 +05:30
marination
c1f6898f1a refactor: Cache Item Reviews and other review feedback
- `get_doc` -> `get_values` and `db.sql` -> `db.delete` in Wishlist Item deletion
- cache first page of Item Reviews and burst cache on addition and deletion of reviews
- Update redisearch docs link in E Commerce Settings
- Removed unused cint import
- Broke setting attribute context into smaller functions and code cleanup
- Minor recommended items padding tweak
- Item reviews form dict now uses website item as key
- Customer reviews rendered from UI style consistency
- Stock status consistency in listing and full page
- Handle no price in variant dialog for matched item
2021-08-25 14:34:13 +05:30
Frappe PR Bot
fcb17f047d fix: validate party and party type only if both available (#27002) (#27133)
* fix: validate party and party type only if both available

* fix: indentation

(cherry picked from commit 8366b6322e)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-08-25 12:49:04 +05:30
Marica
688fe4192c Merge pull request #27118 from 18alantom/fix-scrap-items-updation-bp
fix: update scrap table item details; typo (backport #27052)
2021-08-25 12:36:14 +05:30
rohitwaghchaure
2b875bbf52 Merge pull request #27127 from rohitwaghchaure/v13-fixed-stock-ledger-report-with-included-uom
fix: stock ledger report not working if include uom selected in filter
2021-08-25 01:24:53 +05:30
Rohit Waghchaure
1810b73113 fix: stock ledger report not working if include uom selected in filter 2021-08-25 01:24:02 +05:30
rohitwaghchaure
2ea108ae92 Merge pull request #27126 from rohitwaghchaure/fixed-donot-overrride-batch-no-v13
fix: selected batch no changed on updation of qty
2021-08-25 01:23:10 +05:30
Rohit Waghchaure
2f71b740fd fix: selected batch no changed on updation of qty 2021-08-25 01:22:04 +05:30
Frappe PR Bot
5b411dc1f6 fix: Updated timestamp for pos invoice json (#27110) (#27123)
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit fbc5977248)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
2021-08-24 23:18:35 +05:30
Frappe PR Bot
f13ae4de0b fix: broken URL in supplier portal (#26823) (#27122)
* fix: broken URL

The quotations are supplier quotations, not sales quotation.

* fix: remove erpnext from path

(cherry picked from commit c7bad657b1)

Co-authored-by: Dany Robert <rtdany10@gmail.com>
2021-08-24 22:28:29 +05:30