Skip to content

Commit

Permalink
chore: resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@barredterra
barredterra committed Nov 27, 2024
1 parent 37679d8 commit d014c59
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 205 deletions.
36 changes: 0 additions & 36 deletions erpnext/accounts/doctype/pos_invoice/pos_invoice.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1559,55 +1559,19 @@
"fieldname": "update_billed_amount_in_delivery_note",
"fieldtype": "Check",
"label": "Update Billed Amount in Delivery Note"
<<<<<<< HEAD
=======
},
{
"fieldname": "column_break_gpiw",
"fieldtype": "Column Break"
},
{
"fieldname": "utm_medium",
"fieldtype": "Link",
"label": "Medium",
"options": "UTM Medium",
"print_hide": 1
},
{
"fieldname": "utm_campaign",
"fieldtype": "Link",
"label": "Campaign",
"oldfieldname": "campaign",
"oldfieldtype": "Link",
"options": "UTM Campaign",
"print_hide": 1
},
{
"fieldname": "utm_source",
"fieldtype": "Link",
"label": "Source",
"oldfieldname": "source",
"oldfieldtype": "Select",
"options": "UTM Source",
"print_hide": 1
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
}
],
"icon": "fa fa-file-text",
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:00:34.268756",
=======
"modified": "2024-11-26 13:10:50.309570",
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
"modified_by": "Administrator",
"module": "Accounts",
"name": "POS Invoice",
Expand Down
4 changes: 0 additions & 4 deletions erpnext/accounts/doctype/pos_invoice/pos_invoice.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,8 @@ class POSInvoice(SalesInvoice):
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
<<<<<<< HEAD
company_address_display: DF.SmallText | None
=======
company_address_display: DF.TextEditor | None
company_contact_person: DF.Link | None
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
consolidated_invoice: DF.Link | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
Expand Down
42 changes: 0 additions & 42 deletions erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2167,55 +2167,13 @@
"label": "Update Outstanding for Self",
"no_copy": 1,
"print_hide": 1
<<<<<<< HEAD
=======
},
{
"fieldname": "column_break_imbx",
"fieldtype": "Column Break"
},
{
"fieldname": "utm_medium",
"fieldtype": "Link",
"label": "Medium",
"options": "UTM Medium",
"print_hide": 1
},
{
"fieldname": "utm_content",
"fieldtype": "Data",
"label": "Content",
"print_hide": 1
},
{
"fieldname": "utm_campaign",
"fieldtype": "Link",
"hide_days": 1,
"hide_seconds": 1,
"label": "Campaign",
"oldfieldname": "campaign",
"oldfieldtype": "Link",
"options": "UTM Campaign",
"print_hide": 1
},
{
"fieldname": "utm_source",
"fieldtype": "Link",
"hide_days": 1,
"hide_seconds": 1,
"label": "Source",
"oldfieldname": "source",
"oldfieldtype": "Select",
"options": "UTM Source",
"print_hide": 1
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
}
],
"icon": "fa fa-file-text",
Expand Down
4 changes: 0 additions & 4 deletions erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,8 @@ class SalesInvoice(SellingController):
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
<<<<<<< HEAD
company_address_display: DF.SmallText | None
=======
company_address_display: DF.TextEditor | None
company_contact_person: DF.Link | None
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
company_tax_id: DF.Data | None
contact_display: DF.SmallText | None
contact_email: DF.Data | None
Expand Down
4 changes: 0 additions & 4 deletions erpnext/selling/doctype/quotation/quotation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,8 @@ class Quotation(SellingController):
campaign: DF.Link | None
company: DF.Link
company_address: DF.Link | None
<<<<<<< HEAD
company_address_display: DF.SmallText | None
=======
company_address_display: DF.TextEditor | None
company_contact_person: DF.Link | None
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
competitors: DF.TableMultiSelect[CompetitorDetail]
contact_display: DF.SmallText | None
contact_email: DF.Data | None
Expand Down
58 changes: 0 additions & 58 deletions erpnext/selling/doctype/sales_order/sales_order.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1641,78 +1641,20 @@
"no_copy": 1,
"print_hide": 1,
"report_hide": 1
<<<<<<< HEAD
=======
},
{
"fieldname": "advance_payment_status",
"fieldtype": "Select",
"hidden": 1,
"hide_days": 1,
"hide_seconds": 1,
"in_standard_filter": 1,
"label": "Advance Payment Status",
"no_copy": 1,
"options": "Not Requested\nRequested\nPartially Paid\nFully Paid",
"print_hide": 1
},
{
"fieldname": "column_break_yvzv",
"fieldtype": "Column Break"
},
{
"fieldname": "utm_medium",
"fieldtype": "Link",
"label": "Medium",
"options": "UTM Medium",
"print_hide": 1
},
{
"fieldname": "utm_content",
"fieldtype": "Data",
"label": "Content",
"print_hide": 1
},
{
"fieldname": "utm_source",
"fieldtype": "Link",
"hide_days": 1,
"hide_seconds": 1,
"label": "Source",
"oldfieldname": "source",
"oldfieldtype": "Select",
"options": "UTM Source",
"print_hide": 1
},
{
"fieldname": "utm_campaign",
"fieldtype": "Link",
"hide_days": 1,
"hide_seconds": 1,
"label": "Campaign",
"oldfieldname": "campaign",
"oldfieldtype": "Link",
"options": "UTM Campaign",
"print_hide": 1
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
}
],
"icon": "fa fa-file-text",
"idx": 105,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-05-23 16:35:54.905804",
=======
"modified": "2024-11-26 12:42:06.872527",
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
Expand Down
4 changes: 0 additions & 4 deletions erpnext/selling/doctype/sales_order/sales_order.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,8 @@ class SalesOrder(SellingController):
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
<<<<<<< HEAD
company_address_display: DF.SmallText | None
=======
company_address_display: DF.TextEditor | None
company_contact_person: DF.Link | None
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.SmallText | None
Expand Down
49 changes: 0 additions & 49 deletions erpnext/stock/doctype/delivery_note/delivery_note.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1392,69 +1392,20 @@
"fieldname": "named_place",
"fieldtype": "Data",
"label": "Named Place"
<<<<<<< HEAD
=======
},
{
"fieldname": "delivery_trip",
"fieldtype": "Link",
"label": "Delivery Trip",
"options": "Delivery Trip",
"print_hide": 1
},
{
"fieldname": "column_break_pxls",
"fieldtype": "Column Break"
},
{
"fieldname": "utm_medium",
"fieldtype": "Link",
"label": "Medium",
"options": "UTM Medium",
"print_hide": 1
},
{
"fieldname": "utm_content",
"fieldtype": "Data",
"label": "Content",
"print_hide": 1
},
{
"fieldname": "utm_source",
"fieldtype": "Link",
"label": "Source",
"oldfieldname": "source",
"oldfieldtype": "Select",
"options": "UTM Source",
"print_hide": 1
},
{
"fieldname": "utm_campaign",
"fieldtype": "Link",
"label": "Campaign",
"oldfieldname": "campaign",
"oldfieldtype": "Link",
"options": "UTM Campaign",
"print_hide": 1
},
{
"fieldname": "company_contact_person",
"fieldtype": "Link",
"label": "Company Contact Person",
"options": "Contact",
"print_hide": 1
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
}
],
"icon": "fa fa-truck",
"idx": 146,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:05:02.854990",
=======
"modified": "2024-11-26 12:44:28.258215",
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
Expand Down
4 changes: 0 additions & 4 deletions erpnext/stock/doctype/delivery_note/delivery_note.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ class DeliveryNote(SellingController):
commission_rate: DF.Float
company: DF.Link
company_address: DF.Link | None
<<<<<<< HEAD
company_address_display: DF.SmallText | None
=======
company_address_display: DF.TextEditor | None
company_contact_person: DF.Link | None
>>>>>>> f6776c7d6b (feat: add Company Contact Person in selling transactions (#44362))
contact_display: DF.SmallText | None
contact_email: DF.Data | None
contact_mobile: DF.SmallText | None
Expand Down

0 comments on commit d014c59

Please sign in to comment.