Afshan
a9cdc7b696
style: moved project from reference section to accounting dimensions section ( #22309 )
2020-06-19 11:11:33 +05:30
rohitwaghchaure
a504bdb448
Merge pull request #22329 from scmmishra/fix-grammar-footer
...
refactor: show service instead of services
2020-06-19 10:59:52 +05:30
rohitwaghchaure
ec2dec03cc
Merge pull request #22334 from kennethsequeira/item-sale-hist
...
fix: Customer Group label in Item-wise Sales History report
2020-06-19 10:53:09 +05:30
Kenneth Sequeira
766f978858
fix: Customer Group label in Itemwise Sales report
2020-06-18 23:23:54 +05:30
rohitwaghchaure
9d25826bbe
Merge pull request #22249 from marination/rfq-multi-uom
...
feat: Multi UOM support in Request for Quotation
2020-06-18 20:48:13 +05:30
Shivam Mishra
e892448733
Merge branch 'develop' into fix-grammar-footer
2020-06-18 14:21:03 +00:00
Shivam Mishra
25702a1c55
refactor: show service instead of services
2020-06-18 19:49:46 +05:30
Anurag Mishra
d9b2d635d8
feat: added Expense approver for employee and validation ( #22244 )
...
* feat: added Expense approver for employee nad validation
* fix: requested changes
2020-06-18 19:13:01 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year ( #21880 )
...
* feat: date filter for fiscal year
* fix: rename fieldtypes to valid_for_fieldtypes
* Update utils.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-18 18:18:41 +05:30
Anupam Kumar
77673e27e0
enable Lead create by email ( #22314 )
...
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-18 17:46:20 +05:30
Deepesh Garg
bdb40553c3
Merge pull request #22323 from deepeshgarg007/item_tax_map
...
fix: Do not copy Item Tax template from SO to PO
2020-06-18 17:01:53 +05:30
Deepesh Garg
1ba7708b60
fix: Do not copy Item Tax template from SO to PO
2020-06-18 16:45:16 +05:30
rohitwaghchaure
b5af614824
Merge pull request #22219 from Anurag810/quality_procedure_fix
...
fix: Child is shown in Parent process if added from tree view
2020-06-18 15:51:00 +05:30
rohitwaghchaure
853fce8c7e
Merge branch 'develop' into rfq-multi-uom
2020-06-18 15:49:53 +05:30
rohitwaghchaure
b7a2f8731f
Merge pull request #22048 from nextchamp-saqib/update-items-permission-fix
...
fix: submitted sales order can be updated with no permission
2020-06-18 15:47:12 +05:30
rohitwaghchaure
f1cbe89496
Merge pull request #22086 from deepeshgarg007/rcm_develop
...
fix(India): Reverse charge mechanism for GST
2020-06-18 15:46:42 +05:30
Rucha Mahabal
a529d71ca0
fix(patch): add patch for setting issue metrics ( #22296 )
...
* patch: set issue metrics in Issue documents
* fix: commit after every 100 records
2020-06-18 15:38:43 +05:30
Shivam Mishra
34d2bfbb3e
refactor: handle exceptions when updating addresses ( #22307 )
...
* refactor: handle exceptions when updating addresses
* refactor: fold common statements in a loop
2020-06-18 15:28:55 +05:30
Marica
d6906dccfe
Merge branch 'develop' into rfq-multi-uom
2020-06-18 14:44:46 +05:30
marination
95e9a4ef2c
fix: Patch simplification
...
- Also, apply patch to all docs
2020-06-18 14:46:42 +05:30
Anupam K
bd449c8d07
email digest html fix
2020-06-18 14:20:22 +05:30
Rohit Waghchaure
8d5380a2f0
fix: incorrect variable used
2020-06-18 14:06:31 +05:30
Chinmay Pai
96100e9507
chore: add standard queries hooks to whitelist ( #21939 )
...
standard queries are used within the search widget, and now require to
be whitelisted before they can be executed through the search widget.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
2020-06-18 11:58:54 +05:30
Deepesh Garg
8db89bfab6
Merge pull request #22210 from abhishekbalam/customer_acq_revenue_fix
...
fix: Revenue and Customer Count only in date range in Customer Acq. Report
2020-06-18 11:55:09 +05:30
marination
24ee482d8f
fix: Codacy
2020-06-18 11:49:15 +05:30
Chinmay Pai
755e7c812a
chore: update travis url for docker build action ( #22274 )
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-18 10:05:53 +05:30
Afshan
ea78b24035
style: subtitle to be displayed if provided else empty ( #22298 )
...
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* refactor: renamed set to get
* style: subtitle to be displyed if provided else empty
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-18 09:49:35 +05:30
Mangesh-Khairnar
53b601523b
fix: update shopify api version ( #22284 )
...
Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-06-17 19:31:57 +05:30
Marica
c178013926
Merge pull request #22292 from marination/variant-error-msg
...
fix: Typo in Item Variant Error Message
2020-06-17 19:23:13 +05:30
Marica
7bc9352546
Merge branch 'develop' into variant-error-msg
2020-06-17 19:22:49 +05:30
marination
91dfd000ed
fix: Typo
2020-06-17 19:05:40 +05:30
Shivam Mishra
64d772480b
fix: limit max length for cards ( #22289 )
2020-06-17 18:48:15 +05:30
Shivam Mishra
dec17d5ce4
Merge pull request #22288 from scmmishra/support-portal-fixes
2020-06-17 13:14:49 +00:00
Shivam Mishra
6e231ae0cb
refactor: remove translation
2020-06-17 18:43:59 +05:30
Shivam Mishra
2462f07c87
refactor: update titles
2020-06-17 18:39:49 +05:30
Shivam Mishra
2b18bdfe72
fix: title for support
2020-06-17 18:36:51 +05:30
marination
b9c38a13d1
chore: Remove unnecessary get_doc
2020-06-17 18:36:12 +05:30
Shivam Mishra
7057a807ca
refactor: minor layout fixes to portal
2020-06-17 18:35:38 +05:30
marination
8b19d01d57
fix: Quality Procedure Fixes
...
- Dont prompt error message if parent is the same in child
- filter child procedure field
- Disable New button in tree view
- Editable grid for Quality Procedure Proces table.
2020-06-17 18:35:27 +05:30
Marica
5f3cdce353
Merge branch 'develop' into quality_procedure_fix
2020-06-17 18:27:04 +05:30
Kaviya Periyasamy
fec894f530
fix: modified time updated with the latest date ( #22286 )
2020-06-17 17:39:12 +05:30
Abhishek Balam
a4cd9e2389
use getdate() for comparing dates
2020-06-17 17:13:13 +05:30
Afshan
8546b71358
feat: /support ( #22194 )
...
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* added: /support
* refactor code and implemented fail checks
* removed unused imports
* changed filter from from title to name
* refactor code to move context inside main
* removed unused variable
* refactor: renamed set to get
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-17 16:16:59 +05:30
Deepesh Garg
179365683f
Merge pull request #22265 from frappe/edu-academic-term-validation
...
fix: Adding filter in academic term
2020-06-17 15:34:47 +05:30
Deepesh Garg
0511e8cc03
Merge branch 'develop' into rcm_develop
2020-06-17 15:33:29 +05:30
Marica
10d8aa0225
Merge pull request #22283 from marination/expense-account-message-develop
...
fix: Message Formatting for missing Expense Account
2020-06-17 14:01:10 +05:30
marination
17422a3e45
fix: Message Formatting
2020-06-17 14:00:45 +05:30
Marica
6e751440cf
Merge branch 'develop' into quality_procedure_fix
2020-06-17 13:49:46 +05:30
Anupam Kumar
c6592c880a
fix: Student Admission ( #22255 )
...
* Student Admission fix
* adding check for application
* adding check for application
* updating error message
* added date_diff for date comparision
2020-06-17 12:38:31 +05:30
rohitwaghchaure
67022b2d15
Merge pull request #22275 from frappe/mergify/bp/develop/pr-22267
...
refactor: hide company currency fields in the routing (bp #22267 )
2020-06-17 12:27:40 +05:30