diff --git a/build/tgz/tar_exclude.txt b/build/tgz/tar_exclude.txt index 50d080890e4..af3d3aac3ef 100644 --- a/build/tgz/tar_exclude.txt +++ b/build/tgz/tar_exclude.txt @@ -42,6 +42,8 @@ htdocs/core/triggers/interface_contractfrombill.class.php-NORUN htdocs/core/triggers/interface_modEditeur_Editeur.class.php-NORUN htdocs/custom htdocs/custom2 +htdocs/customleave +htdocs/customgoogle htdocs/document htdocs/documents htdocs/includes/jpgraph2 @@ -63,7 +65,6 @@ htdocs/postnuke htdocs/public/bplc htdocs/rapport htdocs/theme/rodolphe -htdocs/theme/eldy/img/menus/tango* htdocs/telephonie htdocs/voyage mssql @@ -106,6 +107,4 @@ bulot huitre pdf_huitre.modules.php doxygen_warnings.log -dolibarr_install.log -doc_generic_invoice_odt.modules.php -htdocs/theme/bureau2crea +dolibarr_install.log \ No newline at end of file diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index c27329d0192..2e423d2c1a1 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -435,9 +435,10 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m // Define $sqlwhere // If a restore to zero after a month is asked we check if there is already a value for this year. - if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) $maskraz=preg_replace('/^@/','',$reg[2]); - if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) $maskraz=preg_replace('/^@/','',$reg[3]); - if ($maskraz >= 0) + if (! empty($reg[2]) && preg_match('/^@/',$reg[2])) $maskraz=preg_replace('/^@/','',$reg[2]); + if (! empty($reg[3]) && preg_match('/^@/',$reg[3])) $maskraz=preg_replace('/^@/','',$reg[3]); + if ($maskraz == 0) $maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START; + if ($maskraz > 0) { if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth'; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 7ef6027d0f1..31e90acfe3a 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -970,6 +970,33 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0,$hookmanage } } +/** + * Return line unit price including tax + * @param object Object + * @param i Current line number + * @param outputlangs Object langs for output + * @param hidedetails Hide value + * 0 = no + * 1 = yes + * 2 = just special lines + */ +function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0) +{ + if (! empty($object->hooks) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) ) + { + $special_code = $object->lines[$i]->special_code; + if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line); + foreach($object->hooks as $hook) + { + if (method_exists($hook['modules'][$special_code],'pdf_getlineupwithtax')) return $hook['modules'][$special_code]->pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails); + } + } + else + { + if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100); + } +} + /** * Return line quantity * @@ -1154,6 +1181,41 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0,$hookman } } +/** + * Return line total including tax + * @param object Object + * @param i Current line number + * @param outputlangs Object langs for output + * @param hidedetails Hide value + * 0 = no + * 1 = yes + * 2 = just special lines + */ +function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0) +{ + if ($object->lines[$i]->special_code == 3) + { + return $outputlangs->transnoentities("Option"); + } + else + { + if (! empty($object->hooks) && ( ($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) ) + { + $special_code = $object->lines[$i]->special_code; + if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line); + foreach($object->hooks as $hook) + { + if (method_exists($hook['modules'][$special_code],'pdf_getlinetotalwithtax')) return $hook['modules'][$special_code]->pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails); + } + } + else + { + if (empty($hidedetails) || $hidedetails > 1) return + price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100); + } + } +} + /** * Return total quantity of products and/or services * diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index f72620ce790..f02565209c3 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -252,6 +252,7 @@ function select_projects($socid=-1, $selected='', $htmlname='projectid') /** * Output a task line + * * @param $inc * @param $parent * @param $lines @@ -287,7 +288,7 @@ function PLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $ $lastprojectid=$lines[$i]->fk_project; } - print "
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| - |
| - - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - |
-
-
|
-
| com-tecnick-tcpdf | -
| - - - [ class tree: com-tecnick-tcpdf ] - [ index: com-tecnick-tcpdf ] - [ all elements ] - | -
|
- Packages: - com-tecnick-tcpdf - - Files: -
- 2dbarcodes.php
- - barcodes.php - - htmlcolors.php - - pdf417.php - - qrcode.php - - tcpdf.php - - tcpdf_config.php - - unicode_data.php - - - - - Classes: - - |
-
-
|
-