solve conflict

This commit is contained in:
hastichavda
2019-11-16 11:40:50 +05:30
42 changed files with 101 additions and 1657 deletions

View File

@ -182,7 +182,7 @@ export default {
list_of_items: 'This section will contain the list of items.',
select_a_unit: 'select unit',
item_attached_message: 'Cannot delete an item already in use',
item_attached_message: 'Cannot delete an item which is already in use',
confirm_delete: 'You will not be able to recover this Item | You will not be able to recover these Items',
created_message: 'Item created successfully',
updated_message: 'Item updated successfully',
@ -227,7 +227,7 @@ export default {
add_estimate: 'Add Estimate',
save_estimate: 'Save Estimate',
confirm_conversion: 'You want to convert this Estimate into Invoice?',
conversion_message: 'Conversion successful',
conversion_message: 'Invoice created successful',
confirm_send_estimate: 'This estimate will be sent via email to the customer',
confirm_mark_as_sent: 'This estimate will be marked as sent',
confirm_mark_as_accepted: 'This estimate will be marked as Accepted',