lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11059 from atm-greg/FIX_actioncomm_for_long_trigger_name

Browse Source 
fix actioncomm module for long trigger names
This commit is contained in:
Laurent Destailleur 2019-04-24 10:06:55 +02:00 committed by GitHub
commit 21b79d314a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/commande/orderstoinvoice.php
View File

@ -216,7 +216,7 @@ if (($action == 'create' || $action == 'add') && ! $error) {
$fk_parent_line = 0;
}
// FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type, -1, false, 0, $lines[$i]->fk_unit);
$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type, -1, false, 0, $lines[$i]->fk_unit, $line[$i]->id);
if ($result > 0) {
$lineid = $result;

2
htdocs/install/mysql/migration/7.0.0-8.0.0.sql
View File

@ -560,3 +560,5 @@ UPDATE llx_advtargetemailing SET fk_element = fk_mailing, type_element='mailing'
ALTER TABLE llx_advtargetemailing DROP COLUMN fk_mailing;
DROP TABLE llx_ticket_logs;
ALTER TABLE llx_actioncomm MODIFY COLUMN code varchar(50);

2
htdocs/install/mysql/tables/llx_actioncomm.sql
View File

@ -29,7 +29,7 @@ create table llx_actioncomm
datep2 datetime, -- date end
fk_action integer, -- type of action (optional link with id in llx_c_actioncomm or null)
code varchar(32) NULL, -- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...)
code varchar(50) NULL, -- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...)
datec datetime, -- date creation
tms timestamp, -- date modification