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

Merge pull request #11528 from prietojc/10.0

Browse Source 
Fix: Use special_code=4 for Takepos
This commit is contained in:
Laurent Destailleur 2019-07-25 18:31:53 +02:00 committed by GitHub
commit 3101d52283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/migration/9.0.0-10.0.0.sql
View File

@ -399,5 +399,8 @@ insert into llx_c_type_contact(rowid, element, source, code, libelle, active ) v
ALTER TABLE llx_ticket_extrafields ADD INDEX idx_ticket_extrafields (fk_object); ALTER TABLE llx_ticket_extrafields ADD INDEX idx_ticket_extrafields (fk_object);
-- Use special_code=3 in Takepos
-- VMYSQL4.1 UPDATE llx_facturedet AS fd LEFT JOIN llx_facture AS f ON f.rowid = fd.fk_facture SET fd.special_code = 4 WHERE f.module_source = 'takepos' AND fd.special_code = 3;
UPDATE llx_website_page set fk_user_creat = fk_user_modif WHERE fk_user_creat IS NULL and fk_user_modif IS NOT NULL; UPDATE llx_website_page set fk_user_creat = fk_user_modif WHERE fk_user_creat IS NULL and fk_user_modif IS NOT NULL;

10
htdocs/takepos/invoice.php
View File

@ -306,14 +306,14 @@ if ($action == "order" and $placeid != 0)
$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2); $catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->special_code == "3") { continue; if ($line->special_code == "4") { continue;
} }
$c = new Categorie($db); $c = new Categorie($db);
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id'); $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$result = array_intersect($catsprinter1, $existing); $result = array_intersect($catsprinter1, $existing);
$count = count($result); $count = count($result);
if ($count > 0) { if ($count > 0) {
$sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid"; $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='4' where rowid=$line->rowid";
$db->query($sql); $db->query($sql);
$order_receipt_printer1.= '<tr>' . $line->product_label . '<td class="right">' . $line->qty; $order_receipt_printer1.= '<tr>' . $line->product_label . '<td class="right">' . $line->qty;
if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer1.="<br>(".$line->array_options['options_order_notes'].")"; if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer1.="<br>(".$line->array_options['options_order_notes'].")";
@ -323,14 +323,14 @@ if ($action == "order" and $placeid != 0)
foreach($invoice->lines as $line) foreach($invoice->lines as $line)
{ {
if ($line->special_code == "3") { continue; if ($line->special_code == "4") { continue;
} }
$c = new Categorie($db); $c = new Categorie($db);
$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id'); $existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
$result = array_intersect($catsprinter2, $existing); $result = array_intersect($catsprinter2, $existing);
$count = count($result); $count = count($result);
if ($count > 0) { if ($count > 0) {
$sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid"; $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='4' where rowid=$line->rowid";
$db->query($sql); $db->query($sql);
$order_receipt_printer2.= '<tr>' . $line->product_label . '<td class="right">' . $line->qty; $order_receipt_printer2.= '<tr>' . $line->product_label . '<td class="right">' . $line->qty;
if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer2.="<br>(".$line->array_options['options_order_notes'].")"; if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer2.="<br>(".$line->array_options['options_order_notes'].")";
@ -512,7 +512,7 @@ if ($placeid > 0)
$htmlforlines = ''; $htmlforlines = '';
$htmlforlines.= '<tr class="drag drop oddeven posinvoiceline'; $htmlforlines.= '<tr class="drag drop oddeven posinvoiceline';
if ($line->special_code == "3") { if ($line->special_code == "4") {
$htmlforlines.= ' order'; $htmlforlines.= ' order';
} }
$htmlforlines.= '" id="' . $line->id . '">'; $htmlforlines.= '" id="' . $line->id . '">';