Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20231114 feat purchase order confirmation rebased 1 #225

Merged
merged 38 commits into from
Nov 14, 2023
Merged

20231114 feat purchase order confirmation rebased 1 #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
10c514e
Auftrags-Controller: Anzeige Menü WF->LS mit Artikelauswahl aus TypeData
bblessmann Nov 2, 2023
1b9948c
Lieferantenauftragsbestätigung: DB und Nummernkreis
bblessmann Oct 23, 2023
e26719e
S:D:H:TransNumberGenerator: Kosmetik: Ausrichtung
bblessmann Oct 24, 2023
7e12ffd
Lieferantenauftragsbestätigung: S:C:Order:TypeData
bblessmann Oct 24, 2023
48f0c3d
Lieferantenauftragsbestätigung: DB-Type order_types
bblessmann Oct 24, 2023
217fd4b
S:D:Order:Typedata: Kosmetik: Ausrichtung
bblessmann Oct 24, 2023
4a6557b
Lieferantenauftragsbestätigung: Menüeinträge
bblessmann Oct 24, 2023
c04bc3b
Lieferantenauftragsbestätigung: Controller/Maske
bblessmann Oct 25, 2023
4425d55
Lieferantenauftragsbestätigung: design40: Maske
bblessmann Oct 25, 2023
64cb58a
Lieferantenauftragsbestätigung: DMS
bblessmann Oct 25, 2023
4478717
Kosmetik: Ausrichtung
bblessmann Oct 25, 2023
3c207d4
Lieferantenauftragsbestätigung: WebDav
bblessmann Oct 25, 2023
55f3c5e
Lieferantenauftragsbestätigung: S:D:Order:new_from
bblessmann Oct 25, 2023
f781cda
Kosmetik: Ausrichtung
bblessmann Oct 25, 2023
c4bcc89
Lieferantenauftragsbestätigung: Bericht
bblessmann Oct 25, 2023
565b77d
Kosmetik: Ausrichtung
bblessmann Oct 25, 2023
3526920
Lieferantenauftragsbestätigung: Schnellsuche
bblessmann Oct 25, 2023
c7ca357
Lieferantenauftragsbestätigung: Verknüpfte Belege
bblessmann Oct 25, 2023
5b87828
Kosmetik: Ausrichtung
bblessmann Oct 25, 2023
7204be4
Lieferantenauftragsbestätigung: Drucken
bblessmann Oct 25, 2023
824d7f7
Lieferantenauftragsbestätigung: Vorbelegte E-Mail-Texte
bblessmann Oct 27, 2023
0b08a38
Lieferantenauftragsbestätigung: Nicht drucken, nicht per Mail verschi…
bblessmann Oct 27, 2023
c81ae94
Lieferantenauftragsbestätigung: WF -> Rechnung
bblessmann Nov 2, 2023
3d78804
Lieferantenauftragsbestätigung: Übersetzungen
bblessmann Oct 25, 2023
7cee1f5
Lieferantenauftragsbestätigung: changelog
bblessmann Oct 25, 2023
3cf0aca
Lieferantenauftragsbestätigung: Bestätigungsnummer des Lieferanten (D…
bblessmann Nov 3, 2023
b312720
Lieferantenauftragsbestätigung: Bestätigungsnummer des Lieferanten: M…
bblessmann Nov 3, 2023
b10102d
Kosmetik: oe/search: HTML-Template: emacs glücklich machen
bblessmann Nov 3, 2023
63c36f4
Lieferantenauftragsbestätigung: Bericht: Bestätigungsnummer des Liefe…
bblessmann Nov 3, 2023
fecfef3
EK-Lieferschein-Bericht: Bestätigungsnummer des Lieferanten …
bblessmann Nov 3, 2023
3c61ead
EK-Lieferschein: Nummer der Lieferantenbestätigung in Maske anzeigen
bblessmann Nov 8, 2023
bc5770c
S:DO: unbenutze Variable entfernt
bblessmann Nov 8, 2023
0d8c4a6
Lieferscheinbericht: HTML-Template: falschen Namen bei Input-Tag korr…
bblessmann Nov 8, 2023
de284a1
Lieferscheinbericht: Auftragsbestätigungsnummer anzeigen und filtern …
bblessmann Nov 8, 2023
a669a53
Lieferantenauftragsbestätigung: Nummernbezeichnung in Makse geändert.
bblessmann Nov 8, 2023
00162a3
Lieferantenauftragsbestätigung: Nummernbezeichnung im Bericht geändert
bblessmann Nov 8, 2023
0228e31
Lieferscheinbericht: Fix: Auftragsbestätigungsnummer anzeigen und fil…
bblessmann Nov 10, 2023
744b106
Lieferantenauftragsbestätigung: Datum- u. Nummernbezeichnung in Makse…
bblessmann Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SL/BackgroundJob/SetNumberRange.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sub run {

my $defaults = SL::DB::Default->get;

foreach (qw(invnumber cnnumber soinumber pqinumber sonumber ponumber sqnumber rfqnumber sdonumber pdonumber)) {
foreach (qw(invnumber cnnumber soinumber pqinumber sonumber ponumber pocnumber sqnumber rfqnumber sdonumber pdonumber)) {
my $current_number = SL::PrefixedNumber->new(number => $defaults->{$_});
$current_number->set_to($next_year * $multiplier);
$defaults->{$_} = $current_number->get_current;
Expand Down
55 changes: 28 additions & 27 deletions SL/Controller/File.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,34 @@ __PACKAGE__->run_before('check_object_params', only => [ qw(list ajax_delete aja
# model: base name of the rose model
# right: access right used for import
my %file_types = (
'sales_quotation' => { gen => 1, gltype => '', dir =>'SalesQuotation', model => 'Order', right => 'import_ar' },
'sales_order_intake' => { gen => 5, gltype => '', dir =>'SalesOrderIntake', model => 'Order', right => 'import_ar' },
'sales_order' => { gen => 5, gltype => '', dir =>'SalesOrder', model => 'Order', right => 'import_ar' },
'sales_delivery_order' => { gen => 1, gltype => '', dir =>'SalesDeliveryOrder', model => 'DeliveryOrder', right => 'import_ar' },
'sales_reclamation' => { gen => 5, gltype => '', dir =>'SalesReclamation', model => 'Reclamation', right => 'import_ar' },
'invoice' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' },
'invoice_for_advance_payment' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' },
'final_invoice' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' },
'credit_note' => { gen => 1, gltype => '', dir =>'CreditNote', model => 'Invoice', right => 'import_ar' },
'request_quotation' => { gen => 7, gltype => '', dir =>'RequestForQuotation', model => 'Order', right => 'import_ap' },
'purchase_quotation_intake' => { gen => 7, gltype => '', dir =>'PurchaseQuotationIntake', model => 'Order', right => 'import_ap' },
'purchase_order' => { gen => 7, gltype => '', dir =>'PurchaseOrder', model => 'Order', right => 'import_ap' },
'purchase_delivery_order' => { gen => 7, gltype => '', dir =>'PurchaseDeliveryOrder', model => 'DeliveryOrder', right => 'import_ap' },
'purchase_reclamation' => { gen => 7, gltype => '', dir =>'PurchaseReclamation', model => 'Reclamation', right => 'import_ap' },
'purchase_invoice' => { gen => 6, gltype => 'ap', dir =>'PurchaseInvoice', model => 'PurchaseInvoice',right => 'import_ap' },
'supplier_delivery_order' => { gen => 7, gltype => '', dir =>'SupplierDeliveryOrder', model => 'DeliveryOrder', right => 'import_ap' },
'rma_delivery_order' => { gen => 7, gltype => '', dir =>'RMADeliveryOrder', model => 'DeliveryOrder', right => 'import_ar' },
'vendor' => { gen => 0, gltype => '', dir =>'Vendor', model => 'Vendor', right => 'xx' },
'customer' => { gen => 1, gltype => '', dir =>'Customer', model => 'Customer', right => 'xx' },
'project' => { gen => 0, gltype => '', dir =>'Project', model => 'Project', right => 'xx' },
'part' => { gen => 0, gltype => '', dir =>'Part', model => 'Part', right => 'xx' },
'gl_transaction' => { gen => 6, gltype => 'gl', dir =>'GeneralLedger', model => 'GLTransaction', right => 'import_ap' },
'draft' => { gen => 0, gltype => '', dir =>'Draft', model => 'Draft', right => 'xx' },
'csv_customer' => { gen => 1, gltype => '', dir =>'Reports', model => 'Customer', right => 'xx' },
'csv_vendor' => { gen => 1, gltype => '', dir =>'Reports', model => 'Vendor', right => 'xx' },
'shop_image' => { gen => 0, gltype => '', dir =>'ShopImages', model => 'Part', right => 'xx' },
'letter' => { gen => 7, gltype => '', dir =>'Letter', model => 'Letter', right => 'sales_letter_edit | purchase_letter_edit' },
'sales_quotation' => { gen => 1, gltype => '', dir =>'SalesQuotation', model => 'Order', right => 'import_ar' },
'sales_order_intake' => { gen => 5, gltype => '', dir =>'SalesOrderIntake', model => 'Order', right => 'import_ar' },
'sales_order' => { gen => 5, gltype => '', dir =>'SalesOrder', model => 'Order', right => 'import_ar' },
'sales_delivery_order' => { gen => 1, gltype => '', dir =>'SalesDeliveryOrder', model => 'DeliveryOrder', right => 'import_ar' },
'sales_reclamation' => { gen => 5, gltype => '', dir =>'SalesReclamation', model => 'Reclamation', right => 'import_ar' },
'invoice' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' },
'invoice_for_advance_payment' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' },
'final_invoice' => { gen => 1, gltype => 'ar', dir =>'SalesInvoice', model => 'Invoice', right => 'import_ar' },
'credit_note' => { gen => 1, gltype => '', dir =>'CreditNote', model => 'Invoice', right => 'import_ar' },
'request_quotation' => { gen => 7, gltype => '', dir =>'RequestForQuotation', model => 'Order', right => 'import_ap' },
'purchase_quotation_intake' => { gen => 7, gltype => '', dir =>'PurchaseQuotationIntake', model => 'Order', right => 'import_ap' },
'purchase_order' => { gen => 7, gltype => '', dir =>'PurchaseOrder', model => 'Order', right => 'import_ap' },
'purchase_order_confirmation' => { gen => 7, gltype => '', dir =>'PurchaseOrderConfirmation', model => 'Order', right => 'import_ap' },
'purchase_delivery_order' => { gen => 7, gltype => '', dir =>'PurchaseDeliveryOrder', model => 'DeliveryOrder', right => 'import_ap' },
'purchase_reclamation' => { gen => 7, gltype => '', dir =>'PurchaseReclamation', model => 'Reclamation', right => 'import_ap' },
'purchase_invoice' => { gen => 6, gltype => 'ap', dir =>'PurchaseInvoice', model => 'PurchaseInvoice',right => 'import_ap' },
'supplier_delivery_order' => { gen => 7, gltype => '', dir =>'SupplierDeliveryOrder', model => 'DeliveryOrder', right => 'import_ap' },
'rma_delivery_order' => { gen => 7, gltype => '', dir =>'RMADeliveryOrder', model => 'DeliveryOrder', right => 'import_ar' },
'vendor' => { gen => 0, gltype => '', dir =>'Vendor', model => 'Vendor', right => 'xx' },
'customer' => { gen => 1, gltype => '', dir =>'Customer', model => 'Customer', right => 'xx' },
'project' => { gen => 0, gltype => '', dir =>'Project', model => 'Project', right => 'xx' },
'part' => { gen => 0, gltype => '', dir =>'Part', model => 'Part', right => 'xx' },
'gl_transaction' => { gen => 6, gltype => 'gl', dir =>'GeneralLedger', model => 'GLTransaction', right => 'import_ap' },
'draft' => { gen => 0, gltype => '', dir =>'Draft', model => 'Draft', right => 'xx' },
'csv_customer' => { gen => 1, gltype => '', dir =>'Reports', model => 'Customer', right => 'xx' },
'csv_vendor' => { gen => 1, gltype => '', dir =>'Reports', model => 'Vendor', right => 'xx' },
'shop_image' => { gen => 0, gltype => '', dir =>'ShopImages', model => 'Part', right => 'xx' },
'letter' => { gen => 7, gltype => '', dir =>'Letter', model => 'Letter', right => 'sales_letter_edit | purchase_letter_edit' },
);

#--- 4 locale ---#
Expand Down
18 changes: 15 additions & 3 deletions SL/Controller/Order.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ sub action_delete {
my $text = $self->type eq SALES_ORDER_INTAKE_TYPE() ? $::locale->text('The order intake has been deleted')
: $self->type eq SALES_ORDER_TYPE() ? $::locale->text('The order confirmation has been deleted')
: $self->type eq PURCHASE_ORDER_TYPE() ? $::locale->text('The order has been deleted')
: $self->type eq PURCHASE_ORDER_CONFIRMATION_TYPE() ? $::locale->text('The order confirmation has been deleted')
: $self->type eq SALES_QUOTATION_TYPE() ? $::locale->text('The quotation has been deleted')
: $self->type eq REQUEST_QUOTATION_TYPE() ? $::locale->text('The rfq has been deleted')
: $self->type eq PURCHASE_QUOTATION_INTAKE_TYPE() ? $::locale->text('The quotation intake has been deleted')
Expand Down Expand Up @@ -2109,7 +2110,8 @@ sub save {
id => \@converted_from_oe_ids,
or => [ record_type => SALES_QUOTATION_TYPE(),
record_type => REQUEST_QUOTATION_TYPE(),
(record_type => PURCHASE_QUOTATION_INTAKE_TYPE()) x $self->order->is_type(PURCHASE_ORDER_TYPE()) ]
(record_type => PURCHASE_QUOTATION_INTAKE_TYPE()) x $self->order->is_type(PURCHASE_ORDER_TYPE()),
(record_type => PURCHASE_ORDER_TYPE()) x $self->order->is_type(PURCHASE_ORDER_CONFIRMATION_TYPE()) ]
])
: undef;

Expand Down Expand Up @@ -2178,7 +2180,7 @@ sub pre_render {
$item->active_discount_source($price_source->discount_from_source($item->active_discount_source));
}

if (any { $self->type eq $_ } (SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE(), PURCHASE_ORDER_TYPE())) {
if (any { $self->type eq $_ } (SALES_ORDER_INTAKE_TYPE(), SALES_ORDER_TYPE(), PURCHASE_ORDER_TYPE(), PURCHASE_ORDER_CONFIRMATION_TYPE())) {
# Calculate shipped qtys here to prevent calling calculate for every item via the items method.
# Do not use write_to_objects to prevent order->delivered to be set, because this should be
# the value from db, which can be set manually or is set when linked delivery orders are saved.
Expand Down Expand Up @@ -2340,6 +2342,13 @@ sub setup_edit_action_bar {
only_if => $self->type_data->show_menu('save_and_purchase_order'),
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
],
action => [
t8('Save and Purchase Order Confirmation'),
call => [ 'kivi.Order.purchase_check_for_direct_delivery', { to_type => PURCHASE_ORDER_CONFIRMATION_TYPE() } ],
checks => [ @valid, @req_trans_cost_art, @req_cusordnumber ],
only_if => $self->type_data->show_menu('save_and_purchase_order_confirmation'),
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
],
action => [
t8('Save and Sales Delivery Order'),
call => [ 'kivi.Order.save', {
Expand Down Expand Up @@ -2384,7 +2393,7 @@ sub setup_edit_action_bar {
],
}],
checks => [ @req_trans_cost_art, @req_cusordnumber ],
only_if => (any { $self->type eq $_ } (PURCHASE_ORDER_TYPE())),
only_if => $self->type_data->show_menu('save_and_purchase_delivery_order'),
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.') : undef,
],
action => [
Expand Down Expand Up @@ -2485,6 +2494,7 @@ sub setup_edit_action_bar {
checks => [ @req_trans_cost_art, @req_cusordnumber ],
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
: $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
only_if => $self->type_data->show_menu('save_and_print'),
],
action => [
t8('Save and print'),
Expand All @@ -2494,6 +2504,7 @@ sub setup_edit_action_bar {
checks => [ @req_trans_cost_art, @req_cusordnumber ],
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
: $is_final_version ? t8('This record is the final version. Please create a new sub-version') : undef,
only_if => $self->type_data->show_menu('save_and_print'),
],
action => [
($is_final_version ? t8('E-mail') : t8('Save and E-mail')),
Expand All @@ -2506,6 +2517,7 @@ sub setup_edit_action_bar {
disabled => !$may_edit_create ? t8('You do not have the permissions to access this function.')
: !$self->order->id ? t8('This object has not been saved yet.')
: undef,
only_if => $self->type_data->show_menu('save_and_email'),
],
action => [
t8('Download attachments of all parts'),
Expand Down
Loading