Rohit Waghchaure
04cf2e029f
fix: letter head not found in opening invoice creation tool
2020-06-28 17:08:12 +05:30
barredterra
7df5de9468
fix: hide transaction-specific for master data
...
(cherry picked from commit 30d194d8a7
2020-06-28 11:29:48 +00:00
barredterra
8f7d214853
fix: customer and supplier data
...
(cherry picked from commit 53445aa25a
2020-06-28 11:29:48 +00:00
barredterra
6adb617ede
fix: truncate account names to max length
...
(cherry picked from commit 2976831560
2020-06-28 11:29:48 +00:00
barredterra
3efe0d0e83
refactor: query meta data only once
...
(cherry picked from commit 55c048f56c
2020-06-28 11:29:47 +00:00
barredterra
cf53305abb
fix(report view): explicitly set column width for
...
(cherry picked from commit 7a7add5001
2020-06-28 11:29:47 +00:00
Deepesh Garg
4c230ed4b0
Merge pull request #21690 from alyf-de/refactor_datev
...
fix(regional): DATEV report
2020-06-28 16:55:18 +05:30
Deepesh Garg
c8b11143a1
Merge pull request #22445 from Alchez/dev-job-offer-list-view
...
fix: setup status indicators for Job Offer and Job Applicant (develop)
2020-06-28 16:49:28 +05:30
rohitwaghchaure
e4d296bb1c
Merge pull request #22413 from Anurag810/salary-structure-help-fix
...
fix: 'Condition & Formula Help' appears twice
2020-06-28 16:29:20 +05:30
rohitwaghchaure
7e3f10e5bc
Merge pull request #22397 from Anurag810/salary_deductions_report_fixes
...
fix: Salary deductions report fixes
2020-06-28 16:27:37 +05:30
rohitwaghchaure
81af2235f4
Merge branch 'develop' into dev-job-offer-list-view
2020-06-28 15:25:32 +05:30
rohitwaghchaure
41cd4fc788
Merge pull request #22478 from michellealva/cost_center_filter
...
fix: apply filters in all transactions
2020-06-28 15:10:13 +05:30
rohitwaghchaure
4cc2e70348
Merge pull request #22454 from wojosc/patch-10
...
refactor: update customs_tariff_number.json
2020-06-28 15:07:19 +05:30
rohitwaghchaure
69aa2e400a
Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223
...
feat: Accounting entries for service item in Purchase receipt (bp #22223 )
2020-06-28 11:26:21 +05:30
rohitwaghchaure
cc2d7f3e7f
Merge pull request #22450 from marination/serial-no-rename
...
fix: Disable Renaming in Serial No
2020-06-28 11:15:35 +05:30
rohitwaghchaure
d5736711ce
fix: indentation
2020-06-28 11:12:20 +05:30
rohitwaghchaure
2f4971b5a6
Merge pull request #22461 from britlog/develop
...
fix: product_info
2020-06-28 11:05:26 +05:30
Deepesh Garg
1d8b13c943
Merge pull request #22483 from deepeshgarg007/loan_security_shorttfall_fixes
...
fix: Loan security shortfall fixes
2020-06-27 18:57:14 +05:30
Deepesh Garg
a4b9fc74aa
Merge branch 'develop' into feat_taxjar
2020-06-27 18:51:48 +05:30
Deepesh Garg
589364856c
fix: Syntax Error
2020-06-27 18:44:36 +05:30
Deepesh Garg
72ba8f1203
Merge pull request #22481 from frappe/michellealva-patch-7
...
fix: change button label in issue
2020-06-27 18:01:45 +05:30
Michelle Alva
2f37c447dd
fix: change button label in issue
...
Changed the label of the button from "Make" to "Create" so that it is consistent with other DocTypes.
Before:
2020-06-27 09:27:45 +05:30
Marica
92bea1326a
Merge branch 'develop' into serial-no-rename
2020-06-26 20:34:09 +05:30
Marica
14ad9e789d
Merge pull request #22477 from michellealva/label-fix2
...
fix: remove redundant label in salary slip
2020-06-26 20:32:23 +05:30
michellealva
08f842d12e
fix: apply filters in all transactions
2020-06-26 19:56:00 +05:30
michellealva
e9cec2ff76
fix: remove redundant label in salary slip
2020-06-26 19:39:54 +05:30
britlog
0086a3727f
fix: product_info
2020-06-26 15:30:27 +02:00
Rucha Mahabal
5dd4bcb229
fix: set total hold time only if hold configurations are enabled
2020-06-26 18:22:24 +05:30
Rucha Mahabal
28c1e8ef77
fix: handle hold time for custom statuses
2020-06-26 18:21:53 +05:30
rohitwaghchaure
275ebefdd2
Merge pull request #22468 from frappe/shopping-cart-settings
...
fix: enable show_configure_button when shopping cart is enabled
2020-06-26 17:20:35 +05:30
mergify[bot]
fce39f706d
fix: Send email to credit controllers to increase credit limit ( #22473 )
...
(cherry picked from commit 0ff5af222a
2020-06-26 16:21:56 +05:30
rohitwaghchaure
b2ae6d9961
Merge pull request #22467 from nabinhait/credit_limit_email
...
fix: Send email to credit controllers to increase credit limit
2020-06-26 15:49:25 +05:30
rohitwaghchaure
13e8c32172
Update shopping_cart_settings.js
2020-06-26 15:07:32 +05:30
rohitwaghchaure
b47218f7b3
Merge pull request #22470 from marination/production-plan-test
...
fix: Sales Order to MR test failing
2020-06-26 15:05:53 +05:30
marination
0f056ec51d
fix: Sales Order to MR test failing
2020-06-26 14:12:11 +05:30
Wolfram Schmidt
a97715e464
Update customs_tariff_number.json
2020-06-26 10:24:48 +02:00
Anupam K
0ce70bd68f
Merge branch 'develop' of https://github.com/frappe/erpnext into shopping-cart-settings
2020-06-26 12:47:37 +05:30
Nabin Hait
0ff5af222a
fix: Send email to credit controllers to increase credit limit
2020-06-26 12:46:42 +05:30
Anupam K
27d27c924d
enable show_configure_button when shopping cart is enabled
2020-06-26 12:46:40 +05:30
rohitwaghchaure
cc7e1b0ec5
Merge pull request #22400 from AfshanKhan/FR_ISS_204290
...
fix: removed condition that considered "Standard working hours" while…
2020-06-25 23:23:33 +05:30
rohitwaghchaure
2eb452f3bb
Merge pull request #22458 from scmmishra/fix-email-digest-so-company
...
fix: add company filter in email digest
2020-06-25 23:18:38 +05:30
rohitwaghchaure
6cf568d094
Merge pull request #22462 from marination/production-plan-ux
...
fix: Handling Empty tables in Production Plan
2020-06-25 23:15:28 +05:30
rohitwaghchaure
5414e2c306
Merge pull request #22463 from frappe/michellealva-fiscal_year
...
fix: grammatical fix on error message
2020-06-25 23:11:36 +05:30
Michelle Alva
978722621f
fix: grammatical fix on error message
...
Before:
Fiscal Year: 2020 does not exists
After:
Fiscal Year 2020 Does Not Exist
2020-06-25 22:35:33 +05:30
marination
c8f590bc8f
fix: Handling Empty tables in Production Plan
2020-06-25 21:30:45 +05:30
Shivam Mishra
5374e7ae1f
fix: add company filter in email digest
2020-06-25 19:41:42 +05:30
Wolfram Schmidt
7f2a3e8c7d
Update customs_tariff_number.json
...
Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.
2020-06-25 13:56:32 +02:00
marination
f311f52f6e
fix: Disable Renaming in Serial No
2020-06-25 16:02:18 +05:30
Saqib
40847aeac3
fix: cannot cancel assets with repair pending ( #22440 )
...
* fix: cannot cancel assets with repair pending
* fix: message
* Update asset.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-25 15:43:31 +05:30
Deepesh Garg
4c726b25ee
fix: Add view ledger button for cancelled docs ( #22433 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:37:04 +05:30
