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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-10-18 10:17:31 +02:00
commit f0ee706055
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/lib/xcal.lib.php
View File

@ -519,7 +519,8 @@ function quotedPrintDecode($str)
* preg_replace /e modifier is deprecated in PHP 5.5 * preg_replace /e modifier is deprecated in PHP 5.5
* but anonymous functions for use in preg_replace_callback are only available from 5.3.0 * but anonymous functions for use in preg_replace_callback are only available from 5.3.0
*/ */
if (version_compare(PHP_VERSION, '5.3.0') >= 0) { /* if (version_compare(PHP_VERSION, '5.3.0') >= 0)
{
$out = preg_replace_callback( $out = preg_replace_callback(
'/=([A-F0-9]{2})/', '/=([A-F0-9]{2})/',
function ($m) { function ($m) {
@ -527,9 +528,11 @@ function quotedPrintDecode($str)
}, },
$out $out
); );
} else {
$out = preg_replace('/=([A-F0-9]{2})/e', chr(hexdec('\\1')), $out);
} }
else
{*/
$out = @preg_replace('/=([A-F0-9]{2})/e', chr(hexdec('\\1')), $out);
// }
return trim($out); return trim($out);
} }

1
htdocs/install/mysql/migration/3.4.0-3.5.0.sql
View File

@ -301,6 +301,7 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN fk_cond_reglement integer NULL;
insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (9,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1); insert into llx_c_action_trigger (rowid,code,label,description,elementtype,rang) values (9,'COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
ALTER TABLE llx_contratdet ADD column product_type integer DEFAULT 1 after total_ttc;
create table llx_contrat_extrafields create table llx_contrat_extrafields
( (

1
htdocs/install/mysql/tables/llx_contratdet.sql
View File

@ -52,6 +52,7 @@ create table llx_contratdet
total_localtax1 double(24,8) DEFAULT 0, -- Total Local tax 1 de la ligne total_localtax1 double(24,8) DEFAULT 0, -- Total Local tax 1 de la ligne
total_localtax2 double(24,8) DEFAULT 0, -- Total Local tax 2 de la ligne total_localtax2 double(24,8) DEFAULT 0, -- Total Local tax 2 de la ligne
total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantite et incluant remise ligne et globale total_ttc double(24,8) DEFAULT 0, -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
product_type integer DEFAULT 1, -- Product type (1=service by default)
info_bits integer DEFAULT 0, -- TVA NPR ou non info_bits integer DEFAULT 0, -- TVA NPR ou non
buy_price_ht double(24,8) DEFAULT NULL, -- buying price buy_price_ht double(24,8) DEFAULT NULL, -- buying price