CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 02:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,943 Commits 423 Branches 1,722 Tags
2a615af00a754162c202d10f77e1c1d36a6d48cd
Commit Graph

40943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankush Menat
4e14d28564 fix: ensure correct-ish transfer against 
(cherry picked from commit 86efa0dbfd)
 2022-01-28 13:52:20 +05:30
Ankush Menat
03bd68654b chore: disable annoying flake8 formatting for QB (#29488) 
[skip ci]

(cherry picked from commit 251576a6bb)
 2022-01-28 13:50:02 +05:30
mergify[bot]
67689e7374 fix: stock ledger rendering glitch (#29482) 
undefined Issue

(cherry picked from commit f380042195)

Co-authored-by: smehata <53169014+smehata@users.noreply.github.com>
(cherry picked from commit 0dafa8a12a)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2022-01-27 20:24:51 +05:30
Suraj Shetty
4e4855fed7 Merge pull request #29473 from frappe/mergify/bp/version-13-hotfix/pr-29471 2022-01-27 11:27:29 +05:30
Suraj Shetty
352c585ef5 fix: Further sort sales_order_analysis to get consistent response 
Since the data was sorted by `transaction_date`, report sorting order used to be inconsistent everytime if there were lots of records with same transaction date. This used to create problems while exporting report as "Excel" with filters.

(cherry picked from commit 29c7947db0)
 2022-01-27 05:46:44 +00:00
Akash Krishna
d2b61bbe8a fix(healthcare): populate current practitioner in appointment availability popup (#29405) 
* fix: Remove two-way patient fetch from inpatient_record (Lab Test, Vital Signs, Sample Collection)

* fix: Patient Appointment - practitioner field gettng cleared on Check Availability dialog, added Practitioner name in the dialog

* fix: Patient Appointment - set practitioner in check availability dialog load

Co-authored-by: Chillar Anand <chillar@avilpage.com>
 2022-01-26 14:13:40 +05:30
mergify[bot]
58fd7044b5 fix: remove all stock UOM conversion when changing stock UOM (#29463) 
(cherry picked from commit eb8d08b411)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-26 12:28:26 +05:30
Rucha Mahabal
177a209f50 fix(Employee): set user image and validate user id only if user data is found (#29452) 2022-01-25 16:49:53 +05:30
marination
c6273b32ee fix: Use get for conditionally available fields while setting missing values 
- Due to custom field "supplier" and missing field "supplier_address", dot operator breaks
- Make sure to use "get" instead of just dot operator if field is in some doctypes, not all

(cherry picked from commit 78b6b29a57)
 2022-01-25 07:22:45 +00:00
Saurabh
034773a670 fix: broken patches (#29067) 
* chore: patch fixes

* fix: remove desktop icons while deleting sales reports

* refactor: dont ignore dangerous exceptions in patches

* fix: make patch kinda idempotent

with previous query rerunning would've caused all values to become 0.

* fix: check type before patching

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-25 11:12:25 +05:30
mergify[bot]
63ccddfcc9 fix: fetch "transfer material against" from BOM (#29435) (#29436) 
(cherry picked from commit b8fbfed096)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-24 22:10:28 +05:30
Deepesh Garg
ecba064161 Merge pull request #29404 from deepeshgarg007/doc_currency_override 
fix: Previous document currency getting overridden
 2022-01-24 20:49:09 +05:30
mergify[bot]
895dd68691 fix: honour 'include holidays' setting while marking attendance for leave application (backport #29425) (#29432) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-24 19:21:58 +05:30
mergify[bot]
d361e23a59 test: clear singles cache for changed settings (#29430) (#29431) 
(cherry picked from commit 3d3f0139fd)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-24 18:46:20 +05:30
Deepesh Garg
e8bc4f12a7 fix:Add shipping charges to taxes only if applicable 2022-01-24 16:16:27 +05:30
rohitwaghchaure
aba8788ea2 Merge pull request #29422 from frappe/mergify/bp/version-13-hotfix/pr-29419 
fix: incorrect raw materials quantity in manufacture stock entry (backport #29419)
 2022-01-24 15:32:38 +05:30
rohitwaghchaure
3dfe7faf70 fix: issue of CI 2022-01-24 13:11:13 +05:30
Deepesh Garg
f7593f599e Merge pull request #29424 from frappe/mergify/bp/version-13-hotfix/pr-29360 
test: unit test for deferred item with zero months (backport #29360)
 2022-01-24 13:01:49 +05:30
Deepesh Garg
51518cf978 Merge pull request #29423 from frappe/mergify/bp/version-13-hotfix/pr-29407 
fix: opening invoice creation tool can fetch multiple accounting dimension (backport #29407)
 2022-01-24 13:01:11 +05:30
Deepesh Garg
f6ee0c70e2 Merge branch 'version-13-hotfix' into doc_currency_override 2022-01-24 12:48:53 +05:30
ruthra
abd8291012 test: unit test for deferred items with zero months 
(cherry picked from commit 1e0450ed17)
 2022-01-24 07:12:37 +00:00
ruthra
37bbdc6743 refactor: a more generalized way to clear old entries for test cases 
(cherry picked from commit ed0f9cc063)
 2022-01-24 07:12:36 +00:00
ruthra
24011bc6a4 refactor: fix failing test cases 
(cherry picked from commit f122a47d0d)
 2022-01-24 07:07:04 +00:00
ruthra
1273221477 fix: linter issue 
(cherry picked from commit 80ea163953)
 2022-01-24 07:07:04 +00:00
ruthra
b96fa03228 test: validating custom accouting dimension in opening invoice tool 
- create new dimension 'department'
 - assign and validate department in opening invoices

(cherry picked from commit 88463dc494)
 2022-01-24 07:07:03 +00:00
ruthra
bbd777a9cb fix: opening invoice creation tool not taking in accouting dimension 
(cherry picked from commit e2267cdba8)
 2022-01-24 07:07:03 +00:00
rohitwaghchaure
384c6234d5 fix: conflicts 2022-01-24 12:16:19 +05:30
Rohit Waghchaure
540690252f fix: incorrect raw materials quantity in manufacture stock entry 
(cherry picked from commit f8d232ac26)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order/test_work_order.py
 2022-01-24 06:44:46 +00:00
rohitwaghchaure
43a21f2836 Merge pull request #29337 from anupamvs/crm-contact-duplication-v13 
fix: contact duplication on converting lead to customer
 2022-01-24 10:16:23 +05:30
Saqib Ansari
ddf5ffc47e Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29373 2022-01-23 18:17:56 +05:30
mergify[bot]
2fbaba40b5 fix: bypass_credit_limit_check in credit balance report (#29401) 2022-01-23 18:17:30 +05:30
Britlog
096e7b9ec5 fix: Don't delete barcode while saving Item (#29411) 2022-01-23 16:56:09 +05:30
Rohit Waghchaure
5c8fc3890f Merge branch 'version-13-pre-release' into version-13 v13.19.0 2022-01-23 14:57:36 +05:30
Rohit Waghchaure
f44d90e097 bumped to version 13.19.0 2022-01-23 15:17:36 +05:50
rohitwaghchaure
4305d58273 Merge pull request #29415 from rohitwaghchaure/change-log-for-v13-19 
chore: change log for v13.19.0
 2022-01-23 14:55:32 +05:30
Rohit Waghchaure
194b7fbf2f chore: change log for v13.19.0 2022-01-23 14:50:49 +05:30
Marica
f9de807b25 Merge pull request #29400 from marination/minor-quotation-doc-wrong-var-pre-release 
fix: Wrong variable name breaks Cart Items rendering
 2022-01-21 19:45:49 +05:30
marination
5ed4b43b73 debug: CI 2022-01-21 19:21:38 +05:30
Marica
315d542c2a Merge pull request #29398 from marination/minor-quotation-doc-wrong-var 
fix: Wrong variable name breaks Cart Items rendering
 2022-01-21 19:20:29 +05:30
marination
bfbcde7595 debug: CI 2022-01-21 19:02:47 +05:30
Deepesh Garg
ef782fd35b fix: Previous document currency getting overriden 2022-01-21 18:00:35 +05:30
Ankush Menat
1538076ae4 fix(patch): skip patch if column doesn't exist 2022-01-21 16:11:32 +05:30
Ankush Menat
f60ea20145 test: create and cancel sr no with stock reco 
(cherry picked from commit 4fa93e246e)
 2022-01-21 16:11:32 +05:30
Ankush Menat
91887f215d 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.

(cherry picked from commit 203f0086f8)
 2022-01-21 16:11:32 +05:30
Ankush Menat
0e413ef54e fix: bad default for non-existing serial nos 
serial_no field should have empty string if it doesn't have any serial
nos

(cherry picked from commit 33c4a0b5a9)
 2022-01-21 16:11:32 +05:30
Ankush Menat
f336b5d586 perf: single query to update serial nos 
(cherry picked from commit ea5efd0791)
 2022-01-21 16:11:32 +05:30
marination
b27fe43920 fix: Wrong variable name breaks Cart Items rendering 2022-01-21 16:04:48 +05:30
marination
2be15bd8e0 fix: Wrong variable name breaks Cart Items rendering 2022-01-21 15:58:29 +05:30
Marica
398fa6eb48 Merge pull request #29396 from frappe/mergify/bp/version-13-pre-release/pr-29383 
fix: Cart & Popup Logic of Item variant without Website Item (backport #29383)
 2022-01-21 15:35:16 +05:30
mergify[bot]
d9f783f38e fix: update status on visit cancel (#29389) (#29394) 
* fix: update status on cancelling visit

* test: updated test for cancelling visits

(cherry picked from commit 11c9a5a79f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2022-01-21 15:22:56 +05:30