Skip to content
This repository has been archived by the owner on Dec 27, 2023. It is now read-only.

Commit

Permalink
feature(Sales) Shared Invoices/Deliveries UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@corneliusweiss
corneliusweiss committed Feb 16, 2023
1 parent cea8afc commit 401bb9d
Show file tree
Hide file tree
Showing 61 changed files with 49,484 additions and 44,344 deletions.
12 changes: 6 additions & 6 deletions tine20/Sales/Config.php
View file
Expand Up @@ -248,20 +248,20 @@ class Sales_Config extends Tinebase_Config_Abstract
self::RECORDS => [
[
'id' => self::DOCUMENT_FOLLOWUP_STATUS_NONE,
//_('No followups booked')
'value' => 'No followups booked',
//_('None')
'value' => 'None',
'icon' => null,
'system' => true,
], [
'id' => self::DOCUMENT_FOLLOWUP_STATUS_PARTIALLY,
//_('Followups partially booked')
'value' => 'Followups partially booked',
//_('Partially')
'value' => 'Partially',
'icon' => null,
'system' => true,
], [
'id' => self::DOCUMENT_FOLLOWUP_STATUS_COMPLETED,
//_('Followups booked')
'value' => 'Followups booked',
//_('Completed')
'value' => 'Completed',
'icon' => null,
'system' => true,
],
Expand Down
2 changes: 2 additions & 0 deletions tine20/Sales/Controller/Document/Order.php
View file
Expand Up @@ -46,7 +46,9 @@ protected function __construct()
Sales_Model_Document_Order::FLD_COST_CENTER_ID,
Sales_Model_Document_Order::FLD_COST_BEARER_ID,
Sales_Model_Document_Order::FLD_DESCRIPTION,
Sales_Model_Document_Order::FLD_SHARED_INVOICE,
Sales_Model_Document_Order::FLD_INVOICE_RECIPIENT_ID,
Sales_Model_Document_Order::FLD_SHARED_DELIVERY,
Sales_Model_Document_Order::FLD_DELIVERY_RECIPIENT_ID,
Sales_Model_Document_Order::FLD_FOLLOWUP_DELIVERY_CREATED_STATUS,
Sales_Model_Document_Order::FLD_FOLLOWUP_INVOICE_CREATED_STATUS,
Expand Down
29 changes: 21 additions & 8 deletions tine20/Sales/Model/Document/Abstract.php
View file
Expand Up @@ -150,15 +150,25 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
Zend_Filter_Input::PRESENCE => Zend_Filter_Input::PRESENCE_REQUIRED
]*/
],
self::FLD_REVERSAL_STATUS => [
self::LABEL => 'Reversal', // _('Reversal')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_REVERSAL_STATUS,
self::UI_CONFIG => [
self::READ_ONLY => true,
],
],
self::FLD_DOCUMENT_LANGUAGE => [
self::LABEL => 'Language', // _('Language')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::LANGUAGES_AVAILABLE,
self::SHY => true,
],
self::FLD_DOCUMENT_CATEGORY => [
self::LABEL => 'Category', // _('Category')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_CATEGORY,
self::SHY => true,
],
self::FLD_PRECURSOR_DOCUMENTS => [
self::TYPE => self::TYPE_RECORDS,
Expand Down Expand Up @@ -209,6 +219,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::LENGTH => 255,
self::NULLABLE => true,
self::QUERY_FILTER => true,
self::SHY => true,
],

self::FLD_CUSTOMER_ID => [
Expand All @@ -234,6 +245,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::REF_ID_FIELD => Sales_Model_Document_Address::FLD_DOCUMENT_ID,
self::TYPE => Sales_Model_Document_Address::TYPE_POSTAL,
],
self::SHY => true,
],
self::FLD_CONTACT_ID => [
self::TYPE => self::TYPE_RECORD,
Expand All @@ -244,6 +256,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::MODEL_NAME => Addressbook_Model_Contact::MODEL_PART_NAME,
],
self::NULLABLE => true,
self::SHY => true,
],

self::FLD_POSITIONS => [
Expand All @@ -260,6 +273,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::LABEL => 'Positions Net Sum', //_('Positions Net Sum')
self::TYPE => self::TYPE_MONEY,
self::NULLABLE => true,
self::SHY => true,
self::UI_CONFIG => [
self::READ_ONLY => true,
],
Expand All @@ -268,6 +282,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::LABEL => 'Positions Discount Sum', //_('Positions Discount Sum')
self::TYPE => self::TYPE_MONEY,
self::NULLABLE => true,
self::SHY => true,
self::UI_CONFIG => [
self::READ_ONLY => true,
],
Expand All @@ -278,6 +293,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::INVOICE_DISCOUNT_TYPE,
self::NULLABLE => true,
self::SHY => true,
self::DEFAULT_VAL => 'SUM'
],
self::FLD_INVOICE_DISCOUNT_PERCENTAGE => [
Expand All @@ -291,6 +307,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::TYPE => self::TYPE_FLOAT,
self::SPECIAL_TYPE => self::SPECIAL_TYPE_DISCOUNT,
self::NULLABLE => true,
self::SHY => true,
self::UI_CONFIG => [
'price_field' => self::FLD_POSITIONS_NET_SUM,
'net_field' => self::FLD_NET_SUM
Expand All @@ -309,6 +326,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::LABEL => 'Sales Tax', //_('Sales Tax')
self::TYPE => self::TYPE_MONEY,
self::NULLABLE => true,
self::SHY => true,
self::UI_CONFIG => [
self::READ_ONLY => true,
],
Expand Down Expand Up @@ -347,6 +365,7 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::MODEL_NAME => Tinebase_Model_CostCenter::MODEL_NAME_PART,
],
self::NULLABLE => true,
self::SHY => true,
],
self::FLD_COST_BEARER_ID => [
self::LABEL => 'Cost Bearer', //_('Cost Bearer')
Expand All @@ -356,20 +375,14 @@ abstract class Sales_Model_Document_Abstract extends Tinebase_Record_NewAbstract
self::MODEL_NAME => Tinebase_Model_CostUnit::MODEL_NAME_PART,
],
self::NULLABLE => true,
self::SHY => true,
],
self::FLD_DESCRIPTION => [
self::LABEL => 'Internal Note', //_('Internal Note')
self::TYPE => self::TYPE_TEXT,
self::NULLABLE => true,
self::QUERY_FILTER => true,
],
self::FLD_REVERSAL_STATUS => [
self::LABEL => 'Reversal Status', // _('Reversal Status')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_REVERSAL_STATUS,
self::UI_CONFIG => [
self::READ_ONLY => true,
],
self::SHY => true,
],
]
];
Expand Down
17 changes: 10 additions & 7 deletions tine20/Sales/Model/Document/Delivery.php
View file
Expand Up @@ -61,13 +61,15 @@ public static function inheritModelConfigHook(array &$_definition)
Sales_Model_DocumentPosition_Delivery::MODEL_NAME_PART;

// delivery status
$_definition[self::FIELDS][self::FLD_DELIVERY_STATUS] = [
self::LABEL => 'Status', // _('Status')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_DELIVERY_STATUS,
self::LENGTH => 255,
self::NULLABLE => true,
];
Tinebase_Helper::arrayInsertAfterKey($_definition[self::FIELDS], self::FLD_DOCUMENT_NUMBER,[
self::FLD_DELIVERY_STATUS => [
self::LABEL => 'Status', // _('Status')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_DELIVERY_STATUS,
self::LENGTH => 255,
self::NULLABLE => true,
]
]);

$_definition[self::FIELDS][self::FLD_DOCUMENT_NUMBER][self::NULLABLE] = true;
$_definition[self::FIELDS][self::FLD_DOCUMENT_NUMBER][self::CONFIG][Tinebase_Numberable::CONFIG_OVERRIDE] =
Expand All @@ -94,6 +96,7 @@ public static function inheritModelConfigHook(array &$_definition)
self::TYPE => self::TYPE_BOOLEAN,
self::LABEL => 'Shared Document', //_('Shared Document')
self::DEFAULT_VAL => false,
self::SHY => true,
];

// remove all moneytary fields, this is a delivery document, no money here
Expand Down
17 changes: 10 additions & 7 deletions tine20/Sales/Model/Document/Invoice.php
View file
Expand Up @@ -64,13 +64,15 @@ public static function inheritModelConfigHook(array &$_definition)
Sales_Model_DocumentPosition_Invoice::MODEL_NAME_PART;

// invoice status
$_definition[self::FIELDS][self::FLD_INVOICE_STATUS] = [
self::LABEL => 'Status', // _('Status')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_INVOICE_STATUS,
self::LENGTH => 255,
self::NULLABLE => true,
];
Tinebase_Helper::arrayInsertAfterKey($_definition[self::FIELDS], self::FLD_DOCUMENT_NUMBER, [
self::FLD_INVOICE_STATUS => [
self::LABEL => 'Status', // _('Status')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_INVOICE_STATUS,
self::LENGTH => 255,
self::NULLABLE => true,
]
]);

$_definition[self::FIELDS][self::FLD_DOCUMENT_NUMBER][self::NULLABLE] = true;
$_definition[self::FIELDS][self::FLD_DOCUMENT_NUMBER][self::CONFIG][Tinebase_Numberable::CONFIG_OVERRIDE] =
Expand All @@ -97,6 +99,7 @@ public static function inheritModelConfigHook(array &$_definition)
self::TYPE => self::TYPE_BOOLEAN,
self::LABEL => 'Shared Document', //_('Shared Document')
self::DEFAULT_VAL => false,
self::SHY => true,
];
}

Expand Down
27 changes: 16 additions & 11 deletions tine20/Sales/Model/Document/Offer.php
View file
Expand Up @@ -82,6 +82,18 @@ protected static function _adaptFields(array &$_definition)
$_definition[self::FIELDS][self::FLD_POSITIONS][self::CONFIG][self::MODEL_NAME] =
Sales_Model_DocumentPosition_Offer::MODEL_NAME_PART;

// OFFER_STATUS keyfield: In Bearbeitung(ungebucht, offen), Zugestellt(gebucht, offen),
// Beauftragt(gebucht, offen), Abgelehnt(gebucht, geschlossen)
Tinebase_Helper::arrayInsertAfterKey($_definition[self::FIELDS], self::FLD_DOCUMENT_NUMBER, [
self::FLD_OFFER_STATUS => [
self::LABEL => 'Status', // _('Status')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_OFFER_STATUS,
self::LENGTH => 255,
self::NULLABLE => true,
],
]);

$_definition[self::FIELDS] = array_merge($_definition[self::FIELDS], [
self::FLD_ORDER_ID => [
self::TYPE => self::TYPE_RECORD,
Expand All @@ -92,27 +104,20 @@ protected static function _adaptFields(array &$_definition)
],
self::NULLABLE => true,
],
// OFFER_STATUS keyfield: In Bearbeitung(ungebucht, offen), Zugestellt(gebucht, offen),
// Beauftragt(gebucht, offen), Abgelehnt(gebucht, geschlossen)
self::FLD_OFFER_STATUS => [
self::LABEL => 'Status', // _('Status')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_OFFER_STATUS,
self::LENGTH => 255,
self::NULLABLE => true,
],
self::FLD_FOLLOWUP_ORDER_CREATED_STATUS => [
self::LABEL => 'Followup Order Creation Status', // _('Followup Order Creation Status')
self::LABEL => 'Order Created', // _('Order Created')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_FOLLOWUP_STATUS,
self::SHY => true,
self::UI_CONFIG => [
self::READ_ONLY => true,
],
],
self::FLD_FOLLOWUP_ORDER_BOOKED_STATUS => [
self::LABEL => 'Followup Order Booked Status', // _('Followup Order Booked Status')
self::LABEL => 'Order Booked', // _('Order Booked')
self::TYPE => self::TYPE_KEY_FIELD,
self::NAME => Sales_Config::DOCUMENT_FOLLOWUP_STATUS,
self::SHY => true,
self::UI_CONFIG => [
self::READ_ONLY => true,
],
Expand Down

0 comments on commit 401bb9d

Please sign in to comment.