nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
b8d97b82b81704e893cb75229457ec5dcda7c804
erpnext/erpnext
History
mergify[bot] b8d97b82b8 fix: pricing rule item code UOM apply & conversions (backport #32566) (#32636) 
* fix: pricing rule for non stock UOM and conversions

* fix: pricing rule for non stock UOM and conversions

(cherry picked from commit 96b4211ea1)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.py

* chore: resolve conflicts

Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-10-18 23:31:31 +05:30
..
accounts
fix: pricing rule item code UOM apply & conversions (backport #32566) (#32636)
2022-10-18 23:31:31 +05:30
agriculture
style: bulk format code with black
2022-03-29 17:29:34 +05:30
assets
chore: refactor by just using a filter
2022-09-29 15:37:04 +05:30
buying
fix: Party account for multi-order invoices
2022-10-15 11:29:21 +00:00
change_log
chore: version bump
2022-04-12 23:31:47 +05:30
commands
style: bulk format code with black
2022-03-29 17:29:34 +05:30
communication
chore: remove __future__ py2 compatibility imports
2021-11-25 17:42:24 +05:30
config
style: bulk format code with black
2022-03-29 17:29:34 +05:30
controllers
chore: check only for inter-company transfers
2022-10-12 10:54:15 +00:00
crm
chore: added RFQ Link to Opportunity Dashboard (#30894)
2022-05-13 06:48:34 +00:00
demo
style: bulk format code with black
2022-03-29 17:29:34 +05:30
domains
style: bulk format code with black
2022-03-29 17:29:34 +05:30
e_commerce
chore: Merge Conflicts
2022-07-27 15:51:01 +05:30
education
chore: pre-commit
2022-09-30 23:41:01 -07:00
erpnext_integrations
style: Fix formatting
2022-08-20 14:19:15 +05:30
healthcare
chore: Update test case
2022-05-25 23:52:40 +05:30
hotels
style: bulk format code with black
2022-03-29 17:29:34 +05:30
hr
chore: make linter happy
2022-09-30 15:33:34 +05:30
hub
…
hub_node
style: bulk format code with black
2022-03-29 17:29:34 +05:30
loan_management
fix: pending accrual entries
2022-09-14 08:45:27 +00:00
maintenance
fix: Purposes not set
2022-08-25 05:19:36 +00:00
manufacturing
fix: consider overproduction percentage for WO finish button
2022-09-27 12:15:43 +00:00
non_profit
fix: do not update component amount for timesheet components (#31696)
2022-07-26 12:35:50 +05:30
patches
fix: Disbursement Account in patch to update old loans
2022-09-28 14:06:42 +00:00
payroll
chore: Remove print
2022-09-13 12:00:06 +05:30
portal
chore: Make image field obsolete in Website Item (redundant)
2022-07-27 10:14:16 +00:00
projects
fix: Parent Level project linkning on creating PO from project
2022-09-17 15:00:56 +00:00
public
fix: pricing rule item code UOM apply & conversions (backport #32566) (#32636)
2022-10-18 23:31:31 +05:30
quality_management
test: Do not overwrite frappe.form_dict to retain proxy reference
2022-08-20 14:14:16 +05:30
regional
Merge pull request #32453 from deepeshgarg007/intra_state_transfer_eway_bill_v13
2022-10-03 09:07:26 +05:30
restaurant
style: bulk format code with black
2022-03-29 17:29:34 +05:30
selling
fix: Party account for multi-order invoices
2022-10-15 11:29:21 +00:00
setup
fix: Brand Defaults filters
2022-10-12 13:53:56 +00:00
shopping_cart
chore: remove deprecated and empty QUnit tests (#27179) (#27181)
2021-08-26 21:08:08 +05:30
startup
chore: drop dead code (backport #32595) (#32597)
2022-10-13 15:27:09 +05:30
stock
Merge pull request #32584 from frappe/mergify/bp/version-13-hotfix/pr-32557
2022-10-12 17:17:01 +05:30
support
style: bulk format code with black
2022-03-29 17:29:34 +05:30
telephony
fix: Replace walrus operator
2022-08-22 09:49:15 +05:30
templates
fix: show Make Purchase Invoice button based on permission
2022-09-29 09:27:03 +00:00
tests
fix: Update received_by if "to" is changed
2022-08-20 14:15:54 +05:30
translations
chore: fr translation
2022-10-06 22:39:40 +02:00
utilities
fix: don't try to update youtube data if disabled in settings (backport #32588) (#32590)
2022-10-13 11:57:08 +05:30
www
fix: update with new Frappe color. fix #32455 (#32456)
2022-10-02 17:02:25 +00:00
__init__.py
chore(release): Bumped to Version 13.36.1
2022-07-21 08:26:20 +00:00
.stylelintrc
chore: whitespace cleanup from codebase
2021-08-19 14:33:03 +05:30
exceptions.py
style: bulk format code with black
2022-03-29 17:29:34 +05:30
hooks.py
chore: drop dead code (backport #32595) (#32597)
2022-10-13 15:27:09 +05:30
modules.txt
chore: Removed Shopping Cart Module
2021-03-08 10:28:02 +05:30
patches.txt
chore: patch for removing stale values in Naming Series (#32271)
2022-09-19 13:35:08 +05:30