search

Pengin-Open-Source / pengin-pi

PENGIN PI! A CRM with the back bone of a feature light ERP system. Utilitarian in design, easy to extend, customize, and deploy. Made by a community, supported by Tobu Pengin.
GNU General Public License v3.0
9 stars 1 forks source link

426 company restoration #444

Open abanks72 opened 5 months ago

abanks72 commented 5 months ago

Company Restoration

Add ticket workflow functionality for company creation/edit with CompanyChangeRequest, and CompanyHIstory tables for tracking changes.

franfif commented 4 months ago

I resolved the conflicts between both branches.

franfif commented 4 months ago

Somehow, two blocks of code were duplicated after I resolved the conflicts. I don't understand how this arrived as I systematically accepted one version and deleted the other. The two blocks of code to remove are:

  1. app/routes/companies.py: display_company_members(company_id) - The second one, line 212.
  2. app/db/models/orders.py: class OrderHistory(db.Model) - The first one, line 44.