Saurabh
8bd9bf2be6
Merge branch 'v12-pre-release' into version-12
2020-08-27 10:04:32 +05:30
Saurabh
fc7121e38f
bumped to version 12.11.2
2020-08-27 10:24:32 +05:50
rohitwaghchaure
03488f8285
Merge pull request #23177 from marination/pricing-rule-missing-fix-v12-pre-release
...
fix: Pricing Rule encoding missing line
2020-08-27 10:00:48 +05:30
marination
4cce4a7712
fix: get_applied_pricing_rule in taxes_and_totals
2020-08-26 20:18:37 +05:30
marination
4e3bbb8e74
fix: get_applied_pricing_rule in taxes_and_totals
2020-08-26 20:09:11 +05:30
Rucha Mahabal
a3907e1329
fix: don't overwrite appointment duration if already specified
2020-08-26 15:15:05 +05:30
Anupam K
759282651b
feat: Added phone field in product Inquiry
2020-08-26 14:23:56 +05:30
rohitwaghchaure
3bae6328c5
Merge pull request #23153 from ruchamahabal/fix-conversion-factor-v12
...
fix: conversion factor for BOM exploded item rate
2020-08-26 13:02:48 +05:30
Deepesh Garg
45d615887a
fix: Codacy fixes
2020-08-26 12:12:06 +05:30
Rucha Mahabal
ed6cbc1239
Merge pull request #23164 from frappe/michellealva-sales_invoice_dashboard
...
fix: Add Delivery Note link in Sales Invoice Dashboard
2020-08-25 21:09:50 +05:30
Michelle Alva
deb741bea5
fix:Add Delivery Note link in Sales Invoice Dashboard
2020-08-25 21:00:41 +05:30
Saurabh
271f8b5cfd
Merge branch 'v12-pre-release' into version-12
2020-08-25 20:01:54 +05:30
Saurabh
f26e66b2b5
bumped to version 12.11.1
2020-08-25 20:21:54 +05:50
Saurabh
020534046c
Merge pull request #23162 from rohitwaghchaure/pricing-rule-not-working-js-side-v12-pre-release
...
fix: mixed condition pricing rule not working on js side
2020-08-25 20:01:02 +05:30
Rohit Waghchaure
0407a435d7
fix: mixed condition pricing rule not working on js side
2020-08-25 19:59:17 +05:30
Saurabh
1c19050aa4
Merge pull request #23160 from rohitwaghchaure/pricing-rule-not-working-js-side
...
fix: mixed condition pricing rule not working on js side
2020-08-25 19:40:54 +05:30
Rohit Waghchaure
62876c708b
fix: mixed condition pricing rule not working on js side
2020-08-25 18:32:46 +05:30
Rucha Mahabal
3fc00a5bfe
fix: conversion factor for BOM exploded item rate
2020-08-25 18:09:14 +05:30
Saurabh
8245640ca2
Merge pull request #23149 from rohitwaghchaure/pricing-rule-encoding-pre-release-v12
...
fix(hot): Pricing Rule encoding fixed
2020-08-25 17:24:56 +05:30
Rohit Waghchaure
29d24cddcf
fix(hot): Pricing Rule encoding fixed
2020-08-25 17:22:20 +05:30
Saurabh
9aa230c1b8
Merge pull request #23146 from rohitwaghchaure/pricing-rule-encoding-hotfix
...
fix(hot): Pricing Rule encoding fixed
2020-08-25 17:19:17 +05:30
Rohit Waghchaure
d223d4b829
fix(hot): Pricing Rule encoding fixed
2020-08-25 16:18:44 +05:30
Anurag Mishra
69bb85d1d0
fix: Form dashboard showing wrong balance
2020-08-25 06:55:02 +05:30
rohitwaghchaure
51c29cafee
Merge pull request #23082 from ruchamahabal/fix-pos-print-v12
...
fix: Print Language for Customer not set for POS Invoice
2020-08-24 16:11:26 +05:30
rohitwaghchaure
6594d127cb
Merge pull request #23113 from wojosc/patch-12
...
refactor: allow to rename lead
2020-08-24 16:09:14 +05:30
rohitwaghchaure
65d16d1ef6
Merge pull request #23117 from nabinhait/subcontracted-pr-gle-v12
...
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-24 16:06:59 +05:30
Deepesh Garg
9b4cc0b6e9
fix: Update paid amount for pos return ( #20543 )
...
* fix: Paid amount updation for pos return
* fix: Remove console
* fix: Styling
* fix: get default mode of payment from POS profile
* fix: Add test cases
* fix: Codacy
2020-08-24 15:01:57 +05:30
Saurabh
f843d6aa53
Merge branch 'v12-pre-release' into version-12
2020-08-24 10:11:45 +05:30
Saurabh
c6ed332903
bumped to version 12.11.0
2020-08-24 10:25:29 +05:50
Nabin Hait
ad07abeb3f
chore: Added change log
2020-08-23 11:27:05 +05:30
Nabin Hait
a82d9d3182
test: Test case for GLE in subcontracted PR if FG item rate is zero
2020-08-22 20:07:19 +05:30
Nabin Hait
98fda4b8c3
fix: GLE for subcontracted PR is fg item rate is zero
2020-08-22 20:07:05 +05:30
Wolfram Schmidt
572d150925
Update lead_source.json
...
as requested in https://github.com/frappe/erpnext/pull/22872
2020-08-21 20:02:29 +02:00
Saqib
6c6175200c
fix: cannot search items in offline pos ( #23083 )
2020-08-21 15:40:29 +05:30
rohitwaghchaure
6bb2038323
Merge pull request #23084 from nextchamp-saqib/pos-search-fix-pre-release
...
fix: cannot search items in offline pos
2020-08-21 13:13:50 +05:30
Nabin Hait
3d1df94ad2
fix:Validate Job offer against vacancies ( #23108 )
2020-08-20 19:39:03 +05:30
Nabin Hait
fa36a06188
fix:Validate Job offer against vacancies ( #23107 )
2020-08-20 19:38:55 +05:30
Deepesh Garg
c3c06c36a5
Merge pull request #23103 from deepeshgarg007/rcm_submit
...
fix: Unable to submit reverse charge invoice
2020-08-20 19:36:02 +05:30
Deepesh Garg
53aee98103
Merge pull request #23104 from deepeshgarg007/rcm_submit_v12
...
fix: Unable to submit reverse charge invoice
2020-08-20 19:35:48 +05:30
Marica
e52bd5c699
fix: Create Opoortunity without Default Company from Email ( #23099 )
...
* fix: Create Opoortunity without Default Company from Email
* fix: Add Prompt to Select Company
* Update communication.js
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2020-08-20 19:11:59 +05:30
Marica
685ca83b5e
fix: Create Opoortunity without Default Company from Email ( #23098 )
...
* fix: Create Opoortunity without Default Company from Email
* fix: Add Prompt to Select Company
* Update communication.js
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2020-08-20 19:11:40 +05:30
Deepesh Garg
e1f9148351
Merge branch 'v12-pre-release' of https://github.com/frappe/erpnext into rcm_submit_v12
2020-08-20 16:49:43 +05:30
Deepesh Garg
093fb84377
fix: Unable to submit reverse charge invoice
2020-08-20 16:44:08 +05:30
Deepesh Garg
8c5bc5631a
fix: Unable to submit reverse charge invoice
2020-08-20 16:31:38 +05:30
Rucha Mahabal
46456fdc19
Merge pull request #23095 from nextchamp-saqib/sr-no-selector-fix-hotfix
...
fix: val is not defined
2020-08-20 15:01:58 +05:30
Rucha Mahabal
737d305f45
Merge pull request #23094 from nextchamp-saqib/sr-no-selector-fix-pre-release
...
fix: val is not defined
2020-08-20 15:01:28 +05:30
Deepesh Garg
2aa23f91b1
Merge pull request #23092 from rohitwaghchaure/not-able-to-submit-dn-hotfix
...
fix: not able to submit delivery note
2020-08-20 13:35:40 +05:30
Saqib Ansari
2cc0ad51f5
fix: val is not defined
2020-08-20 12:54:36 +05:30
Saqib Ansari
193222a336
fix: val is not defined
2020-08-20 12:53:43 +05:30
rohitwaghchaure
46bea91469
Merge pull request #23093 from rohitwaghchaure/not-able-to-submit-dn
...
fix: not able to submit delivery note
2020-08-20 12:28:35 +05:30
