nicolas/phone_app
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Wip bon de livraison

Browse Source
This commit is contained in:
Barnabé 2021-09-13 18:36:21 +02:00
parent 2a540f292a
commit 6751e34f29
3 changed files with 283 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
app/controllers/admin/price_documents_controller.rb
View File

@ -670,4 +670,84 @@ class Admin::PriceDocumentsController < ApplicationController
redirect_to admin_price_document_path(@price_document) redirect_to admin_price_document_path(@price_document)
end end
end end
def bon_de_reception
@past_price_document = PriceDocument.find(params[:id])
@p_customer_sheet = @past_price_document.ref_element
if @p_customer_sheet
price_document = @p_customer_sheet.price_documents.new(:price_document_type => PriceDocumentType.find_by_label("Bon de réception achat"), :demande_de_prix_id => @past_price_document.id, :date => Date.today)
else
price_document = PriceDocument.new(:price_document_type => PriceDocumentType.find_by_label("Bon de réception achat"), :date => Date.today)
end
price_document.doc_ref_id = @past_price_document.id
price_document.p_fournisseur = @past_price_document.p_fournisseur
price_document.price_line_block = @past_price_document.price_line_block.dup
if @past_price_document.cc_label == "Commande achat"
price_document.bon_de_commande_achat_id = @past_price_document.id
price_document.reliquat = true if PriceDocument.where(:bon_de_commande_achat_id => @past_price_document.id, :price_document_type_id => [5]).count > 0
end
if @past_price_document.cc_label == "Facture achat"
price_document.facture_achat_id = @past_price_document.id
end
price_document.price_line_block.ac_bon_de_commande_id = nil
price_document.price_line_block.ac_bon_de_livraison_id = nil
price_document.price_line_block.ac_facture_id = nil
price_document.price_line_block.ac_block_type = nil
price_document.price_line_block.ac_reliquat = nil
@past_price_document.price_line_block.price_lines.each do |pl|
new_pl = pl.dup
new_pl.price_line_ref_id = pl.id
new_pl.ac_block_type = nil
if price_document.reliquat and @p_customer_sheet
bls = PriceDocument.where(:bon_de_commande_achat_id => @past_price_document.id, :price_document_type_id => [5])
qte_ok = PriceLine.where(:price_line_ref_id => new_pl.price_line_ref_id).where(:price_line_block_id => PriceLineBlock.where(:price_lineable_type => "PriceDocument", :price_lineable_id => bls.ids)).sum(:qte)
new_pl.qte = new_pl.qte - qte_ok
end
price_document.price_line_block.price_lines << new_pl
end
if price_document.save
#price_document.reset_for_update
#price_document.archive_now
if @p_customer_sheet
@p_customer_sheet.state = "Bon de réception achat"
@p_customer_sheet.save
end
if price_document.ref_element
redirect_to [:admin, price_document.ref_element]
else
redirect_to [:admin, price_document]
end
else
render :inline => price_document.errors.messages.to_s
end
end
end end

233
app/views/admin/price_documents/show.html.haml
View File

@ -43,8 +43,13 @@
%td %td
=link_to @price_document.p_fournisseur.name, [:admin, @price_document.p_fournisseur] if @price_document.p_fournisseur =link_to @price_document.p_fournisseur.name, [:admin, @price_document.p_fournisseur] if @price_document.p_fournisseur
-if @price_document.d_number?
%tr
%td Numéro
%td=@price_document.d_number
%tr
%td Date
%td=l @price_document.date, :format => :date
-if @price_document.label == "Demande prix" -if @price_document.label == "Demande prix"
%tr %tr
@ -119,65 +124,65 @@
-if @price_document.label != "Demande prix" and @price_document.label != "Réponse fournisseur" -if @price_document.label != "Demande prix" and @price_document.label != "Réponse fournisseur"
-if current_admin and current_admin.id == 1 -if current_admin and current_admin.id == 1
%table.table -enable_stat = false
%tr -if enable_stat
%th Archivé ? %table.table
%td %tr
= diag do %th Archivé ?
-if @price_document.archived %td
Oui = diag do
=link_to "Désarchiver", unarchive_now_admin_price_document_path(@price_document.id) -if @price_document.archived
-else Oui
=link_to "Archiver", archive_now_admin_price_document_path(@price_document.id) =link_to "Désarchiver", unarchive_now_admin_price_document_path(@price_document.id)
%tr -else
%th Id bloc =link_to "Archiver", archive_now_admin_price_document_path(@price_document.id)
%td=price_line_block.id %tr
%th Id bloc
%td=price_line_block.id
%tr %tr
%th Cout block %th Cout block
%td=price_line_block.cc_cost_ht %td=price_line_block.cc_cost_ht
-params[:search][:per_page] = params[:search][:per_page] || 5000 -params[:search][:per_page] = params[:search][:per_page] || 5000
-per_page = params[:search][:per_page] -per_page = params[:search][:per_page]
-page = (params[:page] and params[:page] != "") ? params[:page] : 1 -page = (params[:page] and params[:page] != "") ? params[:page] : 1
-@stat_lines = @price_document.stat_lines.order("date DESC, created_at DESC") -@stat_lines = @price_document.stat_lines.order("date DESC, created_at DESC")
-@stat_lines = sort_by_sorting(@stat_lines, "created_at DESC") -@stat_lines = sort_by_sorting(@stat_lines, "created_at DESC")
-@stat_lines = @stat_lines.page(page).per(per_page) -@stat_lines = @stat_lines.page(page).per(per_page)
%br %br
=link_to "Générer les stats", generate_stat_lines_admin_price_document_path(@price_document), :class => "btn btn-primary" =link_to "Générer les stats", generate_stat_lines_admin_price_document_path(@price_document), :class => "btn btn-primary"
%table.table %table.table
%tr %tr
%th %th
HT HT
%td %td
=number_to_currency @stat_lines.sum(:tot_amount_ht) =number_to_currency @stat_lines.sum(:tot_amount_ht)
%tr %tr
%th %th
TTC TTC
%td %td
=number_to_currency @stat_lines.sum(:tot_amount_ttc) =number_to_currency @stat_lines.sum(:tot_amount_ttc)
%tr %tr
%th %th
Coût HT Coût HT
%td %td
=number_to_currency @stat_lines.sum(:cost_ht) =number_to_currency @stat_lines.sum(:cost_ht)
.clear .clear
=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @stat_lines} =render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @stat_lines}
@ -185,12 +190,13 @@
%h3 Lignes de produits
%table.table %table.table
%thead %thead
%tr %tr
%th %th
%th Référence %th Référence
%th Produit %th Marque
%th Désignation %th Désignation
%th Qté %th Qté
%th P.U. HT %th P.U. HT
@ -208,11 +214,10 @@
%td %td
=link_to price_line.p_product_ref.p_product.name, edit_admin_p_product_path(price_line.p_product_ref.p_product) if price_line.p_product_ref and price_line.p_product_ref.p_product =price_line.p_product_ref.p_product.s_brand.name
%td %td
=price_line.title =link_to price_line.p_product_ref.cc_name, edit_admin_p_product_path(price_line.p_product_ref.p_product) if price_line.p_product_ref and price_line.p_product_ref.p_product
%td.numeraire %td.numeraire
=price_line.qte =price_line.qte
@ -230,93 +235,93 @@
%td.numeraire %td.numeraire
=number_to_currency price_line.tot_amount_ht =number_to_currency price_line.tot_amount_ht
%td / %td=# price_line.line_stocks.sum(:price_ht)
= price_line.line_stocks.sum(:price_ht)
-if current_admin.has_permission?("show-costs") .qi_row
%br -if current_admin.has_permission?("show-costs")
%br %p
%p -if @price_document.price_document_type_id == 6
-if @price_document.price_document_type_id == 6 =link_to "Générer les stocks", generate_stocks_admin_price_document_path(@price_document), :class => "btn btn-primary" if !@price_document.stock_ok
=link_to "Générer les stocks", generate_stocks_admin_price_document_path(@price_document), :class => "btn btn-primary" if !@price_document.stock_ok -elsif @price_document.price_document_type_id == 4 or @price_document.price_document_type_id == 5
-elsif @price_document.price_document_type_id == 4 or @price_document.price_document_type_id == 5 %p
%p Coût :
Coût : =number_to_currency @price_document.cost_ht
=number_to_currency @price_document.cost_ht %p
%p Marge :
Marge : =number_to_currency @price_document.marge_ht
=number_to_currency @price_document.marge_ht
-if !@price_document.cost_ok -if !@price_document.cost_ok
=link_to "Mettre à jour les stocks, calculer la marge", update_stocks_admin_price_document_path(@price_document), :class => "btn btn-primary" =link_to "Mettre à jour les stocks, calculer la marge", update_stocks_admin_price_document_path(@price_document), :class => "btn btn-primary"
-if @price_document.d_number
-if @price_document.cc_label == "Commande achat"
%p=link_to "Générer un bon de réception", bon_de_reception_admin_price_document_path(@price_document), :class => "btn btn-primary"
-if false -if false
-if @price_document.price_document_type_id == 4 or @price_document.price_document_type_id == 5 and !@price_document.cost_ok -if @price_document.price_document_type_id == 4 or @price_document.price_document_type_id == 5 and !@price_document.cost_ok
%table.table.table-striped.table-hover.table-bordered %table.table.table-striped.table-hover.table-bordered
%thead %thead
%tr %tr
%th Produit %th Produit
%th Quantité dans cette pièce comptable %th Quantité dans cette pièce comptable
%th Quantité restante %th Quantité restante
%th %th
-@price_document.price_line_block.price_lines.all.each do |pl| -@price_document.price_line_block.price_lines.all.each do |pl|
-if pl.p_product_ref -if pl.p_product_ref
-if pl.p_product_ref.assembled -if pl.p_product_ref.assembled
-pl.p_product_ref.p_product_assembleds.all.each do |ppa| -pl.p_product_ref.p_product_assembleds.all.each do |ppa|
%tr
%td
=ppa.p_product_ref.cc_name
%td
=@a = (pl.qte.to_f * ppa.qte.to_f).to_f
%td
=link_to admin_line_stocks_path(:p_product_ref_id => ppa.p_product_ref.id) do
=@b = LineStock.where(:p_product_ref_id => ppa.p_product_ref_id).sum(:qte_available).to_f
%td
-if @a > @b
.red=ic :warning
-else
%tr %tr
%td %td
=pl.p_product_ref.cc_name =ppa.p_product_ref.cc_name
%td %td
=@a = pl.qte.to_f =@a = (pl.qte.to_f * ppa.qte.to_f).to_f
%td %td
=link_to admin_line_stocks_path(:p_product_ref_id => pl.p_product_ref.id) do =link_to admin_line_stocks_path(:p_product_ref_id => ppa.p_product_ref.id) do
=@b = LineStock.where(:p_product_ref_id => pl.p_product_ref_id).sum(:qte_available).to_f =@b = LineStock.where(:p_product_ref_id => ppa.p_product_ref_id).sum(:qte_available).to_f
%td %td
-if pl.p_product_ref.stocked and @a > @b -if @a > @b
.red=ic :warning .red=ic :warning
-else
%tr
%td
=pl.p_product_ref.cc_name
%td
=@a = pl.qte.to_f
%td
=link_to admin_line_stocks_path(:p_product_ref_id => pl.p_product_ref.id) do
=@b = LineStock.where(:p_product_ref_id => pl.p_product_ref_id).sum(:qte_available).to_f
%td
-if pl.p_product_ref.stocked and @a > @b
.red=ic :warning
-if @price_document.price_document_type_id == 6 or @price_document.price_document_type_id == 4 or @price_document.price_document_type_id == 5 -if @price_document.price_document_type_id == 6 or @price_document.price_document_type_id == 4 or @price_document.price_document_type_id == 5
%h3 Stocks générés %h3 Stocks générés
#bills #bills
-params[:search][:per_page] = params[:search][:per_page] || 5000 -params[:search][:per_page] = params[:search][:per_page] || 5000
-per_page = params[:search][:per_page] -per_page = params[:search][:per_page]
-page = (params[:page] and params[:page] != "") ? params[:page] : 1 -page = (params[:page] and params[:page] != "") ? params[:page] : 1
-@line_stocks = @price_document.line_stocks.order("date DESC, created_at DESC") -@line_stocks = @price_document.line_stocks.order("date DESC, created_at DESC")
-if params[:price_document_ids] -if params[:price_document_ids]
-@line_stocks = @line_stocks.where(:id => params[:price_document_ids]) -@line_stocks = @line_stocks.where(:id => params[:price_document_ids])
-@line_stocks = sort_by_sorting(@line_stocks, "created_at DESC") -@line_stocks = sort_by_sorting(@line_stocks, "created_at DESC")
-@line_stocks = @line_stocks.page(page).per(per_page) -@line_stocks = @line_stocks.page(page).per(per_page)
%br %br
.clear .clear
=render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @line_stocks} =render :partial => "qi/qi_ordered_table", :locals => {:qi_ordered_table_collection => @line_stocks}
-if @price_document.label == "Demande prix" -if @price_document.label == "Demande prix"

2
config/routes.rb
View File

@ -632,6 +632,8 @@ Rails.application.routes.draw do
post :analyse_reponses_save post :analyse_reponses_save
get :generate_final_consult get :generate_final_consult
get :buy_order_create get :buy_order_create
get :bon_de_reception
end end
collection do collection do
get :search_to_affect get :search_to_affect