lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,043 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-3
Commit Graph

25717 Commits

Author SHA1 Message Date
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code 
New : integration gpec, source code
 2021-10-11 15:39:54 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom 
Fix creataing invoice originating for custom module object
 2021-10-11 15:26:07 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Indelog
94875cdc77 Fix : Re-add bloc to set $withtargettype and $withsourcetype 2021-10-11 13:37:37 +02:00
Laurent Destailleur
33e811ee96
Merge pull request #18926 from FHenry/fix_get_thirdparties_option_select 
fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies
 2021-10-11 11:50:35 +02:00
Laurent Destailleur
05ddcf5132
Merge pull request #18927 from vincentjdc/supplier-order-export-validation-date-user 
NEW Allow exporting supplier order validation date + validation user
 2021-10-11 11:09:31 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Laurent Destailleur
a57925b0b7 FIX edition of fields on credit transfer tab 2021-10-11 01:43:36 +02:00
Laurent Destailleur
7180f5eeff css 2021-10-10 21:25:46 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
Florian HENRY
5d393f201c fix sql 2021-10-08 13:17:09 +02:00
Vincent Dieltiens
592fff1cfa Allow exporting supplier order validation date + validation user 2021-10-08 13:09:16 +02:00
Laurent Destailleur
1b504b3e2c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-08 12:15:18 +02:00
Laurent Destailleur
806d832549 Fix canonical url for open graph 2021-10-08 12:00:13 +02:00
Laurent Destailleur
a057c7c2a7 Add og graph 2021-10-08 11:49:28 +02:00
Laurent Destailleur
da0a9e13f5 Fix twitter tag 2021-10-08 11:41:45 +02:00
Laurent Destailleur
cb490c0eac Allow twitter cards per page. 2021-10-08 11:06:28 +02:00
Laurent Destailleur
816e4cdde6 Comment 2021-10-08 10:59:11 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Laurent Destailleur
9cf46eaf25 Fix stats graphs 2021-10-06 20:29:48 +02:00
Laurent Destailleur
34187d53f6 Fix missing invoice in stats when due date is unknown/null 2021-10-06 20:10:36 +02:00
Laurent Destailleur
88a482c615 Fix phpcs 2021-10-06 18:40:32 +02:00
Laurent Destailleur
520a4f55f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-06 18:34:03 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Indelog
18fb3a352b Add hook to overide sourcetype and targettype for linked object 
This add hook `setLinkedObjectSourceTargetType` in
`CommonObject::showLinkToObjectBlock()` and in
`CommonObject::fetchObjectLinked()` to allow overiding sourcetype and
targettype by custom modules.
 2021-10-06 17:18:45 +02:00
Laurent Destailleur
4208964153
Merge branch 'develop' into patch-10 2021-10-06 16:09:54 +02:00
Laurent Destailleur
7e0ec949c0
Merge pull request #18915 from vincentjdc/vat-number-societe-list 
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
 2021-10-06 15:33:46 +02:00
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
4be2d1414e Fix regression 2021-10-06 14:03:10 +02:00
Francis Appels
dceb2b5341 Fix fatal error 2021-10-06 13:36:11 +02:00
Laurent Destailleur
329bc331db
Merge pull request #18899 from fappels/14_fix_espadon 
FIX fatal error on expedition espadon model
 2021-10-06 13:29:47 +02:00
Laurent Destailleur
ea3e3b133d Debug eventorganization modules 2021-10-06 12:55:07 +02:00
Indelog
45e6ea45dc Fix stickler 2021-10-06 12:19:10 +02:00
Indelog
fb775e2c6e Fix Add module part in llx_element_element on CommonObject::add_object_linked() 
Add module part to target type if object has $module property and is'nt
in core modules.
 2021-10-06 12:14:46 +02:00
Laurent Destailleur
93b4853f8e Fix var_dump 2021-10-06 11:52:12 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Gauthier PC portable 024
1d4d4dfe18 FIX : ihm 2021-10-05 15:43:57 +02:00
Laurent Destailleur
413164f5c0 NEW can upload the odt file for product doc template 2021-10-05 13:48:13 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Laurent Destailleur
379dd9ccbb Fix position of text 2021-10-05 12:09:03 +02:00
Indelog
6c82b1d0e1 Fix creataing invoice originating for custom module 
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.

This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
 2021-10-05 11:35:43 +02:00
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +02:00
Laurent Destailleur
f0703b414a css 2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
3f26ab195b HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Alexandre SPANGARO
d10ec688c7 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:03:13 +02:00
Alexandre SPANGARO
463efd3802 Missing language key 2021-10-05 06:26:19 +02:00
Francis Appels
d3cbda08dc Fix fatal error 2021-10-04 22:12:50 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop 
New : Add showdocument hook
 2021-10-04 20:13:50 +02:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php 2021-10-04 19:20:37 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23 
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
 2021-10-04 15:32:40 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Gauthier PC portable 024
0dd3681e50 FIX : several debug 2021-10-04 14:08:11 +02:00
Laurent Destailleur
66310b14d7 Better way to present open invoice graph 2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Alexandre SPANGARO
42bb9ac6d2 Better URL 2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
042d520061 Change Url 2021-10-03 05:30:49 +02:00
Laurent Destailleur
8ba18f4d73
Merge pull request #18884 from frederic34/patch-9 
doxygen
 2021-10-02 20:38:27 +02:00
Laurent Destailleur
7e48d6d31b
Merge pull request #18886 from frederic34/patch-11 
doxygen
 2021-10-02 20:38:20 +02:00
Laurent Destailleur
bcb7d8c07a
Merge pull request #18887 from frederic34/patch-12 
doxygen
 2021-10-02 20:38:13 +02:00
Laurent Destailleur
1451e95e79
Merge pull request #18888 from frederic34/patch-13 
doxygen
 2021-10-02 20:37:53 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/index.php
 2021-10-02 20:09:06 +02:00
Frédéric FRANCE
828c1d41e7
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:49:33 +02:00
Frédéric FRANCE
0ebe4de80a
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:48:27 +02:00
Frédéric FRANCE
1ba0369f01
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:47:30 +02:00
Frédéric FRANCE
c33d8ac49b
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:40:33 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
c664b78800 MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:30:24 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
0bf1db2fd4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-30 16:29:10 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
44bb5ebf34 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356 Fix avoid error when trigger run on downgraded version. 2021-09-30 16:18:07 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
9460ad152e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-30 14:46:39 +02:00
Laurent Destailleur
d764080636 Add tag data-ignoreidfordnd=1 to ignor lines for drage and drop lines 2021-09-30 14:43:19 +02:00
stickler-ci
c5ad75c7c1 Fixing style errors. 2021-09-30 12:27:01 +00:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
ee79df9bc7
Merge pull request #18839 from indelog/fix_list_of_autoecmfiles 
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
 2021-09-30 13:39:16 +02:00
Laurent Destailleur
ae9643bbef
Update html.formfile.class.php 2021-09-30 13:38:38 +02:00
Laurent Destailleur
3deb424b4f
Merge pull request #18845 from indelog/fix_doc_prev_ecm 
Fix show for external module in ecm index auto page
 2021-09-30 13:36:49 +02:00
Laurent Destailleur
98d8bad955
Merge pull request #18843 from indelog/fix_ecm_deletion 
Fix append module suffix on src_object_type when create ecm file
 2021-09-30 13:32:42 +02:00
Laurent Destailleur
4fe9a4fd30
Merge pull request #18846 from hregis/fix_avoid_warning_if_not_an_array 
FIX avoid warning if $categories is an id
 2021-09-30 13:30:37 +02:00
Laurent Destailleur
1595b38498 Fix param $morecss on img_mime 2021-09-30 00:28:47 +02:00
Laurent Destailleur
a9805fbfc1 NEW The protection MAIN_SECURITY_CSRF_WITH_TOKEN=1 is on by default 2021-09-29 17:34:31 +02:00
Laurent Destailleur
34dacca77c Css 2021-09-29 16:31:40 +02:00
Laurent Destailleur
0f55eea276 css 2021-09-29 14:48:50 +02:00
Laurent Destailleur
9fe72597ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-29 12:43:27 +02:00
Regis Houssin
6e08ecde04 FIX indentation 2021-09-29 08:47:22 +02:00
Laurent Destailleur
baadf2dc6c Fix reposition 2021-09-29 01:51:34 +02:00
Laurent Destailleur
1e840fe7ed Code comment 2021-09-28 18:07:04 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Regis Houssin
43a47999d7 FIX avoid warning if $categories is an id 2021-09-28 16:35:01 +02:00
Indelog
fae0337b3e Fix show for external module in ecm index auto page 
This set the correct `modulepart` parameter for link generated to
`document.php` of ecm auto index page if `src_object_type` for
ecm document has a module suffix (`@modulename`).
 2021-09-28 16:22:28 +02:00
Indelog
5b8b55cfba Fix append module suffix on src_object_type when create ecm file 
Files added to `llx_ecm_files` for externals modules never be removed on
object deletion.

When `CommonObject::deleteEcmFiles()` is called with `mode=1`, it  use
this sql filter to find the file related to the object which is removed
:

```
$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
```

We see it append `'@'.$this->module` to `$this->table_element` but when
file is add to the `llx_ecm_files` by
`CommonObject::commonGenerateDocument()` , it added whiteout the
`'@'.$this->module` suffix. So the file is never remove from
`llx_ecm_files` when object is deleted.

This fix it by appending module suffix on `src_object_type` if object
has `module` property when add document to the `llx_ecm_files`.
 2021-09-28 15:26:08 +02:00
Alexandre SPANGARO
9426af8f6a NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3) 2021-09-28 13:16:44 +02:00
Laurent Destailleur
0c52817426
Merge pull request #18821 from aspangaro/15a20 
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
 2021-09-28 13:14:16 +02:00
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021 
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
 2021-09-28 12:56:43 +02:00
Laurent Destailleur
8f4fb9fd3c
Update barcode.lib.php 2021-09-28 12:56:33 +02:00
Laurent Destailleur
a70f5dd90e Doc 2021-09-28 12:12:11 +02:00
Indelog
2472dff67b Fix FormFile::list_of_autoecmfiles object_instance classname after hook 
FormFile::list_of_autoecmfiles() can instantiate object with parameters
resulting of hook `addSectionECMAuto` but for do this,
it use `${$hookmanager->resArray['classname']}` which return a
`null`. Instead we should do this
`$hookmanager->resArray['classname']`.
 2021-09-28 12:08:45 +02:00
Laurent Destailleur
0e3ec3ea2d Trans 2021-09-28 11:56:43 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
javieralapps4up
11723c2cd0
Update date.lib.php 
Without words, sorry
 2021-09-27 14:49:22 +02:00
javieralapps4up
c4f1eb0c46
Update date.lib.php 
Fix my error
 2021-09-27 14:32:03 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Gauthier PC portable 024
fde0f1ac25 NEW : HRM integration, source code 2021-09-27 11:20:38 +02:00
Laurent Destailleur
4f6586d6a8 Fix token 2021-09-26 20:35:54 +02:00
Laurent Destailleur
d5d4b8d8e0 Fix escape the undescore on search in website module 2021-09-26 14:21:23 +02:00
Laurent Destailleur
567334318a Fix sql eventorganization 2021-09-25 21:13:55 +02:00
Philippe Grand
f7041ef1fc
Update box_members_last_subscriptions.php 2021-09-25 19:03:08 +02:00
Philippe Grand
2edad621b8
Update box_members_last_modified.php 2021-09-25 19:02:28 +02:00
Philippe Grand
694754267c
Update box_members_by_type.php 2021-09-25 19:01:54 +02:00
Philippe Grand
dbe459bc3f
Update box_members_subscriptions_by_year.php 2021-09-25 18:59:39 +02:00
Philippe GRAND
67cc5155b1 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\lib\barcode.lib.php on line 62 2021-09-25 18:15:44 +02:00
Philippe GRAND
1feb6e676c fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_by_type.php on line 70 2021-09-25 16:17:24 +02:00
Philippe GRAND
6b3cf5d482 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions_by_year.php on line 70 2021-09-25 16:15:31 +02:00
Philippe GRAND
d9110a8114 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions.php on line 70 2021-09-25 16:13:35 +02:00
Philippe GRAND
f8609a4619 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_modified.php on line 70 2021-09-25 16:09:34 +02:00
Alexandre SPANGARO
372ba6cf0b NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3) 2021-09-25 07:49:08 +02:00
Laurent Destailleur
9a3d6679f0
Merge pull request #18778 from Hystepik/develop#1 
Fix : KM articles in public/ticket/create_ticket.php
 2021-09-24 13:35:17 +02:00
lmarcouiller
68c9f4064b Fix sql in fetchKnowledgeRecord 2021-09-24 10:43:52 +02:00
Laurent Destailleur
4706ebe004 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-09-24 02:34:59 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/class/task.class.php
 2021-09-24 02:33:48 +02:00
Laurent Destailleur
cd46ccdb66 Code comment 2021-09-24 02:31:15 +02:00
Laurent Destailleur
b09c4166b3 Fix set position of lines in tasks of a project 2021-09-24 02:24:04 +02:00
Laurent Destailleur
4c80e0425b Fix date for tasks created during project creation 2021-09-24 02:10:42 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes 
another set of cleanup for action buttons
 2021-09-24 01:55:25 +02:00
Laurent Destailleur
f98d425064
Merge branch 'develop' into Link-to-MO 2021-09-24 01:54:21 +02:00
lmarcouiller
ef70cd680c fix to match sql syntax 2021-09-23 15:00:55 +02:00
Laurent Destailleur
9d5f6fbc1b Code comment 2021-09-23 13:39:48 +02:00
Laurent Destailleur
b08b7d2f68 NEW Can show progression of task into combo list of tasks 2021-09-23 13:20:42 +02:00
Laurent Destailleur
c39c823b66 Debug Date of line of services mandatory 2021-09-23 13:01:04 +02:00
Laurent Destailleur
545b4c56d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 12:14:54 +02:00
Laurent Destailleur
d39ab4c288 Clean code 2021-09-23 12:14:32 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
4a43ed2852 Fix scrutinizer 2021-09-23 12:05:55 +02:00
Laurent Destailleur
2538ebec03 Better test 2021-09-23 11:40:29 +02:00
Ilias Patsiaouras
977db0a2ba add MO to the list of possible object to link 2021-09-23 11:38:50 +02:00
Laurent Destailleur
a48a8231a1 Fix scrutinizer 2021-09-23 11:33:58 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
51b6318f88 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:14:01 +02:00
Laurent Destailleur
60c11725ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 02:11:11 +02:00
Laurent Destailleur
1e0a7e4342 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:10:39 +02:00
stickler-ci
e5cff0ede1 Fixing style errors. 2021-09-22 16:07:36 +00:00
javieralapps4up
e74043d48e
Close: #18801 Jan-30 + 1m IS NOT Mar-2 
Close: #18801 related to avoid this behaviour https://bugs.php.net/bug.php?id=74013
 2021-09-22 17:56:31 +02:00
Laurent Destailleur
87da490b58 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-22 15:26:35 +02:00
Laurent Destailleur
6f9fc205ef
Merge pull request #18796 from altairis-noe/warehouse_project_elements 
FIX: add warehouse in projects' overview count
 2021-09-22 15:24:05 +02:00
Noé Cendrier
066013c31f typo stickler 2021-09-22 15:15:39 +02:00
Laurent Destailleur
2824c8b8ab FIX support of localtax on expense report 2021-09-22 15:11:18 +02:00
Laurent Destailleur
6c7c6c9efd FIX legal issue on expense report pdf (must also show price without tax) 2021-09-22 12:47:06 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
stickler-ci
49fd1b761c Fixing style errors. 2021-09-21 20:27:33 +00:00
fr69400
73b0d8079c Update html.formfile.class.php 2021-09-21 22:23:14 +02:00
Laurent Destailleur
c433d6ef4f
Merge pull request #18785 from hregis/fix_warning_php8 
FIX check if method exists instead in class
 2021-09-21 19:20:14 +02:00
Laurent Destailleur
7420234494
Merge pull request #18769 from ywarnier/turnover 
Add turnover homepage box
 2021-09-21 19:13:56 +02:00
Laurent Destailleur
b7fadd0307
Merge pull request #18773 from aspangaro/15a18 
Missing language key
 2021-09-21 19:08:32 +02:00
stickler-ci
12be914d04 Fixing style errors. 2021-09-21 16:49:00 +00:00
fr69400
c4dd6be9f8 Add showdocument hook 2021-09-21 18:47:34 +02:00
stickler-ci
d6632757f9 Fixing style errors. 2021-09-21 16:06:03 +00:00
Regis Houssin
e227bdb22b FIX check if method exists instead 2021-09-21 17:58:00 +02:00
Noé Cendrier
c89468428e add warehouse in projects elements count 2021-09-21 17:22:55 +02:00
Regis Houssin
48ce3ea4d3 FIX check if $categories is not empty 2021-09-21 16:31:07 +02:00
ksar
f2b39b3eeb
FIX #18767 : Adherent delete 
Adherent Delete was not working due to the fact that 
$features = 'adherent';
$feature2 = 'cotisation';
And $user->rights->$feature->$subfeature->supprimer does not exist

Also I used the double declaration of salaries.
 2021-09-21 11:27:41 +02:00
lmarcouiller
a7ff9d4889 Fix : KM articles in public/ticket/create_ticket.php 2021-09-21 11:26:49 +02:00
Alexandre SPANGARO
76f7efc193 Missing language key 2021-09-21 03:08:43 +02:00
Yannick Warnier
35e70e7936 Fix method visibility 2021-09-20 23:58:38 +02:00
Yannick Warnier
348c1c4caa Fix empty assignation line 2021-09-20 23:57:49 +02:00
stickler-ci
d919ef9c4c Fixing style errors. 2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd Add turnover homepage box 2021-09-20 19:41:13 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
c75fbb7642 FIX fetch of product with modulebuilder load too much data 2021-09-20 16:00:11 +02:00
Laurent Destailleur
0eff2fa15b FIX default language defined for IN country 2021-09-20 13:20:54 +02:00
Laurent Destailleur
360e3290b5 typo 2021-09-20 04:20:20 +02:00
Laurent Destailleur
14c8bdce1a Better desciption of option 2021-09-19 19:25:38 +02:00
Laurent Destailleur
a747c71cf5 css 2021-09-19 19:19:28 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
30fb0d65bd
Merge pull request #18745 from Hystepik/develop#1 
Fix actions_addupdatedelete.inc.php on lang
 2021-09-18 16:09:04 +02:00
Laurent Destailleur
061cbc4266
Merge pull request #18750 from maksimstojkovic/develop 
Fix Warehouse PDF Generation Error
 2021-09-18 16:08:16 +02:00
Laurent Destailleur
39d55b11b4
Merge pull request #18753 from maksimstojkovic/fix-movement-typo 
Fix typo in pdf_standard.modules.php
 2021-09-18 16:07:41 +02:00
Laurent Destailleur
052511d081 Fix sql error 2021-09-18 15:05:31 +02:00