Raffael Meyer
|
a7ea0ffcf9
|
Merge branch 'develop' into barredterra-patch-1
|
2020-08-28 15:44:21 +02:00 |
|
barredterra
|
a162248f32
|
fix: use hook for website theme scss
|
2020-08-28 15:16:39 +02:00 |
|
Frappe ERPnext
|
a787882a8f
|
feat: Option to print UOM after quantity
Standard for ERPNext prints was UOM before quantity. Now user has a choice.
|
2020-08-28 13:28:52 +02:00 |
|
prssanna
|
fa400820bb
|
fix: move leaderboard style to frappe
|
2020-08-28 15:02:04 +05:30 |
|
marination
|
731bae170e
|
fix: Test for Over Receipt via PRs on a PO
|
2020-08-28 14:09:02 +05:30 |
|
Afshan
|
d659774190
|
fix:tests
|
2020-08-28 13:40:48 +05:30 |
|
Shivam Mishra
|
a6cb27cb8e
|
chore: trigger build
|
2020-08-28 13:10:46 +05:30 |
|
Deepesh Garg
|
d4af7d612d
|
Merge pull request #22943 from deepeshgarg007/navbar_links
fix: Add help link in navbar settings
|
2020-08-28 12:59:45 +05:30 |
|
Afshan
|
7586c3408e
|
fix: test case
|
2020-08-28 12:56:37 +05:30 |
|
Deepesh Garg
|
ecc282930a
|
Merge branch 'develop' into navbar_links
|
2020-08-28 12:48:46 +05:30 |
|
marination
|
e9274283bd
|
fix: Raise Error on over receipt/consumption for sub-contrcated PR
|
2020-08-28 12:21:10 +05:30 |
|
Deepesh Garg
|
6887382937
|
fix: Ignore cpmpany and bank account doctype while deleting company transactions (#22953)
|
2020-08-28 11:52:00 +05:30 |
|
bhavesh95863
|
3e9f493f15
|
fix: change parseFloat to flt
|
2020-08-28 11:15:02 +05:30 |
|
Rucha Mahabal
|
bae2a77d08
|
Merge branch 'develop' into barredterra-patch-1
|
2020-08-28 10:43:02 +05:30 |
|
rohitwaghchaure
|
70b606d468
|
Merge pull request #23174 from bhavesh95863/patch-9
fix: account & cost center filter by company
|
2020-08-28 10:42:51 +05:30 |
|
Rucha Mahabal
|
8cdc3b5d91
|
Merge branch 'develop' into patch-9
|
2020-08-28 10:41:02 +05:30 |
|
rohitwaghchaure
|
78a32f79df
|
Merge pull request #23168 from ruchamahabal/fix-appointment-overlap
fix: don't overwrite patient appointment duration if already specified
|
2020-08-28 10:39:25 +05:30 |
|
rohitwaghchaure
|
3018d38940
|
Merge pull request #23170 from anupamvs/product-contact-us-v13
feat: Added phone field in product Inquiry
|
2020-08-28 10:38:44 +05:30 |
|
rohitwaghchaure
|
c31ae27227
|
Merge pull request #23176 from marination/pricing-rule-missing-fix
fix: Pricing Rule encoding missing line
|
2020-08-28 10:37:38 +05:30 |
|
rohitwaghchaure
|
939b95ad3c
|
Merge pull request #23190 from ruchamahabal/fix-bom-update
fix: BOM Update Tool failing due to Too Many Writes error
|
2020-08-28 10:35:59 +05:30 |
|
Rucha Mahabal
|
599088b479
|
Merge pull request #23185 from michellealva/customer_po
fix: Change fieldtype of Customer's PO in Sales Invoice
|
2020-08-28 10:04:42 +05:30 |
|
bhavesh95863
|
33f984c7af
|
fix: can't multiply sequence by non-int of type 'float
|
2020-08-27 21:49:21 +05:30 |
|
Suraj Shetty
|
f39bb116cc
|
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
|
2020-08-27 19:27:49 +05:30 |
|
prssanna
|
a324e9bd12
|
fix: remove text-muted and small class fromtree items
|
2020-08-27 19:26:14 +05:30 |
|
Suraj Shetty
|
a49af09705
|
fix: Primary button icon
|
2020-08-27 18:57:43 +05:30 |
|
Suraj Shetty
|
b6ebcd7559
|
refactor: Replace darkgray indicator with gray indicator
|
2020-08-27 18:57:18 +05:30 |
|
Rucha Mahabal
|
c8eea556d1
|
fix: BOM Update Tool failing due to Too Many Writes error
|
2020-08-27 18:54:25 +05:30 |
|
prssanna
|
744169833c
|
fix: replace indicator color darkgrey with darkgray
|
2020-08-27 17:06:10 +05:30 |
|
michellealva
|
ead2f6abf0
|
fix: Chage fiedtype of Customer's PO in Sales Invoice
|
2020-08-27 13:57:15 +05:30 |
|
Rucha Mahabal
|
1bd83e69ee
|
feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183)
|
2020-08-27 13:06:52 +05:30 |
|
Marica
|
e7fabb10e1
|
Merge branch 'develop' into general-ledger-filters
|
2020-08-27 11:59:01 +05:30 |
|
Afshan
|
b719620d0c
|
fix: handleling condition if default company doesn't exist
|
2020-08-26 20:55:16 +05:30 |
|
Afshan
|
7600960d2b
|
fix: returned empty list if non US based company
|
2020-08-26 18:40:11 +05:30 |
|
bhavesh95863
|
bb5d886930
|
fix: account & cost center filter by company
|
2020-08-26 18:23:21 +05:30 |
|
marination
|
733fd5f03c
|
fix: get_applied_pricing_rule in taxes_and_totals
|
2020-08-26 18:23:12 +05:30 |
|
Marica
|
d741ac6871
|
Merge branch 'develop' into quoted-item-report-v2
|
2020-08-26 17:33:13 +05:30 |
|
Rucha Mahabal
|
cf2db41876
|
Merge branch 'develop' into fix-appointment-overlap
|
2020-08-26 16:33:27 +05:30 |
|
Rushabh Mehta
|
3ef1490d73
|
Merge pull request #23150 from rmehta/fix-patch
fix(patch): fix patches for tests
|
2020-08-26 16:28:28 +05:30 |
|
Anupam K
|
c7830f7107
|
feat: Added phone field in product Inquiry
|
2020-08-26 15:28:22 +05:30 |
|
Rucha Mahabal
|
9766adbf4e
|
fix: don't overwrite appointment duration if already specified
|
2020-08-26 14:53:23 +05:30 |
|
Rushabh Mehta
|
73f648473f
|
fix(minor): update_start_end_date_for_old_shift_assignment.py
|
2020-08-26 14:51:37 +05:30 |
|
Rushabh Mehta
|
a163d8bc84
|
fix(minor): rename_lost_reason_detail
|
2020-08-26 14:51:37 +05:30 |
|
Rushabh Mehta
|
544d18327c
|
fix(patch): quotation_lost_reason_detail
|
2020-08-26 14:51:37 +05:30 |
|
Rushabh Mehta
|
38fad58834
|
fix(patch)
|
2020-08-26 14:51:37 +05:30 |
|
rohitwaghchaure
|
fe0ecc2ff7
|
Merge pull request #23144 from anupamvs/product-image
fix: Homepage Featured Product image fetch issue
|
2020-08-26 13:05:50 +05:30 |
|
rohitwaghchaure
|
5f4b5f3f46
|
Merge pull request #23151 from ruchamahabal/fix-conversion-factor
fix: conversion factor for BOM exploded item rate
|
2020-08-26 13:01:13 +05:30 |
|
rohitwaghchaure
|
e950dcb32e
|
Merge pull request #23166 from bhavesh95863/patch-8
fix: set company filter in condition
|
2020-08-26 12:57:06 +05:30 |
|
bhavesh95863
|
d888a59bd1
|
fix: set company filter in condition
|
2020-08-26 12:44:20 +05:30 |
|
Abhishek Balam
|
dc9af639a7
|
fix: move condition field
|
2020-08-26 12:26:15 +05:30 |
|
Abhishek Balam
|
7d0bb25aca
|
fix: dont show message on condition syntax error
|
2020-08-26 12:22:31 +05:30 |
|