[koha-commits] main Koha release repository branch master updated. v3.22.00-1095-g5182400
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 1 23:16:42 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 51824008595a5a79ad08052b8035ea5d00654476 (commit)
via 9f9e0ea002dfbf9da92285edbea2df975b6d7de9 (commit)
via 10e5a58c5b8e771e947ef16b593fd3b9d753b624 (commit)
via acb68d21601774d03ada576956c73c44036267ac (commit)
via 07e098ef675f9fc6c177492b1cb7ba197d1e1fb7 (commit)
via c2ec238d9f282612ef5a79a8e5bfa9600b7273f9 (commit)
via fec34d29d5afe3bd4a62c5ebf0a02daf9381ef69 (commit)
via b131304975f9670d4a0e88ef455243cbb0f2bf4e (commit)
via e2e991634854d940405593cb1e05945de2295d4c (commit)
from 9658085d1eafae6fe7f51fb1b39452fbb6f9bf4d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 51824008595a5a79ad08052b8035ea5d00654476
Author: Brendan A Gallagher <brendan at bywatersolutions.com>
Date: Fri Apr 1 21:20:56 2016 +0000
Bug 7736 - RM followup fixing/removing </title> on .tt
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 9f9e0ea002dfbf9da92285edbea2df975b6d7de9
Author: Brendan A Gallagher <brendan at bywatersolutions.com>
Date: Fri Apr 1 20:54:09 2016 +0000
DBRev Bug 7736 - Edifact QUOTE and ORDER functionality
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 10e5a58c5b8e771e947ef16b593fd3b9d753b624
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Fri Mar 18 11:31:41 2016 +0000
Bug 7736 amend edi_cron.pl to use new style call to Context
Bug 9006 changed the api for retrieving config values
from C4::Context after the removal of Autoload
This changes the syntax used to retrieve logdir to reflect
the correct syntax
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit acb68d21601774d03ada576956c73c44036267ac
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 11 14:01:24 2016 +0000
Bug 7736 [QA Followup] - Fix spelling and pod errors
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit 07e098ef675f9fc6c177492b1cb7ba197d1e1fb7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 11 11:58:47 2016 +0000
Bug 7736 [QA Followup] - Fix SQL, Add description field for Library EANs
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit c2ec238d9f282612ef5a79a8e5bfa9600b7273f9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Mar 10 19:35:02 2016 +0000
Bug 7736 [QA Followup] - Fix column headers, values and spelling
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit fec34d29d5afe3bd4a62c5ebf0a02daf9381ef69
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Mar 10 16:58:09 2016 +0000
Bug 7736 [QA Followup] - Fix collation
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit b131304975f9670d4a0e88ef455243cbb0f2bf4e
Author: Zeno Tajoli <z.tajoli at cineca.it>
Date: Tue Oct 27 12:32:52 2015 +0100
Bug 7736 Add Edifact order fields to Acquisition.t
Modification in Acquisition.t to support in test the new fields
of the table aqorders:
line_item_id, suppliers_reference_number,
suppliers_reference_qualifier, suppliers_report
Original patch by Zeno Tajoli
I amended to include the report field (ColinC)
Signed-off-by: Paul Johnson <p.johnson at staffs.ac.uk>
Signed-off-by: Sally Healey <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
commit e2e991634854d940405593cb1e05945de2295d4c
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Jan 20 11:31:31 2016 +0000
Bug 7736: Support Ordering via Edifact EDI messages
Add support for processing incoming Edifact Quotes, Invoices
and order responses and generating and transmission of
Edifact Orders.
Basic workflow is that an incoming quote generates an aquisition
basket in Koha, with each line corresponding to an order record
The user can then generate an edifact order from this (or another)
basket, which is transferred to the vendor's site
The supplier generates an invoice on despatch and this will
result in corresponding invoices being generated in Koha
The orderlines on the invoice are receipted automatically.
We also support order response messages. This may include
simple order acknowledgements, supplier reports/amendments
on availability. Cancellation messages cause the koha order
to be cancelled, other messages are recorded against the order
Which messages are to be supported/processed is specifiable on a
vendor by vendor basis via the admin screens
You can also specify auto order i.e. to generate orders from quotes
without user intervention - This reflects existing
workflows where most work is done on the suppliers website
then generating a dummy quote
Received messages are stored in the edifact_messages table
and the original can be viewed via the online
Database changes are in installer/data/mysql/atomicchanges/edifact.sql
Note new perl dependencies:
Net::SFTP:Foreign
Text::Unidecode
Signed-off-by: Paul Johnson <p.johnson at staffs.ac.uk>
Signed-off-by: Sally Healey <sally.healey at cheshiresharedservices.gov.uk>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 6 +-
C4/Installer/PerlDependencies.pm | 10 +
Koha.pm | 2 +-
Koha/EDI.pm | 1150 ++++++++++++++++++++
Koha/Edifact.pm | 337 ++++++
Koha/Edifact/Line.pm | 864 +++++++++++++++
Koha/Edifact/Message.pm | 249 +++++
Koha/Edifact/Order.pm | 832 ++++++++++++++
Koha/Edifact/Segment.pm | 204 ++++
Koha/Edifact/Transport.pm | 479 ++++++++
Koha/Schema/Result/Aqbasket.pm | 19 +-
Koha/Schema/Result/Aqbookseller.pm | 36 +-
Koha/Schema/Result/Aqbudget.pm | 19 +-
Koha/Schema/Result/Aqinvoice.pm | 32 +-
Koha/Schema/Result/Aqorder.pm | 37 +-
Koha/Schema/Result/Branch.pm | 21 +-
Koha/Schema/Result/EdifactEan.pm | 119 ++
Koha/Schema/Result/EdifactMessage.pm | 202 ++++
Koha/Schema/Result/MsgInvoice.pm | 115 ++
Koha/Schema/Result/VendorEdiAccount.pm | 249 +++++
acqui/basket.pl | 77 ++
acqui/basketgroup.pl | 17 +
acqui/edi_ean.pl | 64 ++
acqui/edifactmsgs.pl | 62 ++
acqui/edimsg.pl | 72 ++
acqui/invoices.pl | 4 +-
admin/edi_accounts.pl | 155 +++
admin/edi_ean_accounts.pl | 161 +++
installer/data/mysql/kohastructure.sql | 76 ++
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 108 ++
installer/data/mysql/userpermissions.sql | 1 +
.../prog/en/includes/acquisitions-menu.inc | 3 +
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 38 +-
.../prog/en/modules/acqui/basketgroup.tt | 2 +
.../intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 39 +
.../prog/en/modules/acqui/edifactmsgs.tt | 90 ++
.../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 35 +
.../prog/en/modules/admin/admin-home.tt | 5 +
.../prog/en/modules/admin/edi_accounts.tt | 306 ++++++
.../prog/en/modules/admin/edi_ean_accounts.tt | 168 +++
.../prog/en/modules/tools/tools-home.tt | 5 +
misc/cronjobs/edi_cron.pl | 163 +++
misc/cronjobs/remove_temporary_edifiles.pl | 41 +
t/EdiInvoice.t | 75 ++
t/Edifact.t | 121 ++
t/Ediorder.t | 56 +
t/Ediordrsp.t | 59 +
t/db_dependent/Acquisition.t | 12 +
t/edi_testfiles/BLSINV337023.CEI | 1 +
t/edi_testfiles/QUOTES_413514.CEQ | 1 +
t/edi_testfiles/ordrsp1.CEA | 1 +
t/edi_testfiles/ordrsp2.CEA | 1 +
t/edi_testfiles/ordrsp3.CEA | 1 +
t/edi_testfiles/ordrsp4.CEA | 1 +
t/edi_testfiles/prquotes_73050_20140430.CEQ | 1 +
57 files changed, 6988 insertions(+), 19 deletions(-)
create mode 100644 Koha/EDI.pm
create mode 100644 Koha/Edifact.pm
create mode 100644 Koha/Edifact/Line.pm
create mode 100644 Koha/Edifact/Message.pm
create mode 100644 Koha/Edifact/Order.pm
create mode 100644 Koha/Edifact/Segment.pm
create mode 100644 Koha/Edifact/Transport.pm
create mode 100644 Koha/Schema/Result/EdifactEan.pm
create mode 100644 Koha/Schema/Result/EdifactMessage.pm
create mode 100644 Koha/Schema/Result/MsgInvoice.pm
create mode 100644 Koha/Schema/Result/VendorEdiAccount.pm
create mode 100755 acqui/edi_ean.pl
create mode 100755 acqui/edifactmsgs.pl
create mode 100755 acqui/edimsg.pl
create mode 100755 admin/edi_accounts.pl
create mode 100755 admin/edi_ean_accounts.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
create mode 100755 misc/cronjobs/edi_cron.pl
create mode 100755 misc/cronjobs/remove_temporary_edifiles.pl
create mode 100755 t/EdiInvoice.t
create mode 100755 t/Edifact.t
create mode 100755 t/Ediorder.t
create mode 100755 t/Ediordrsp.t
create mode 100644 t/edi_testfiles/BLSINV337023.CEI
create mode 100644 t/edi_testfiles/QUOTES_413514.CEQ
create mode 100644 t/edi_testfiles/ordrsp1.CEA
create mode 100644 t/edi_testfiles/ordrsp2.CEA
create mode 100644 t/edi_testfiles/ordrsp3.CEA
create mode 100644 t/edi_testfiles/ordrsp4.CEA
create mode 100644 t/edi_testfiles/prquotes_73050_20140430.CEQ
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list