lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
103,596 Commits 43 Branches 150 Tags 886 MiB
514bcc87ea
Commit Graph

91534 Commits

Author SHA1 Message Date
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
Gauthier PC portable 024
82a299538b FIX : travis 2021-10-08 10:56:51 +02:00
Gauthier PC portable 024
f4ffeacba8 FIX : travis 2021-10-08 10:20:27 +02:00
Gauthier PC portable 024
1329df69c6 FIX : travis 2021-10-08 10:13:19 +02:00
Gauthier PC portable 024
03d7a8e946 FIX : travis 2021-10-08 10:04:35 +02:00
Gauthier PC portable 024
0f6d29549b FIX : travis 2021-10-08 09:57:33 +02:00
Gauthier PC portable 024
e00dcb4f73 FIX : travis 2021-10-08 09:48:17 +02:00
Gauthier PC portable 024
47e1d4f867 FIX : useless function 2021-10-08 09:39:04 +02:00
Gauthier PC portable 024
eb5c7d1f6f FIX : travis 2021-10-08 09:22:35 +02:00
Gauthier PC portable 024
36aff80387 FIX : travis 2021-10-08 09:12:48 +02:00
Alexandre SPANGARO
00eafcb6e7 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:50:22 +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
Florian HENRY
677002e834 fix travis 2021-10-07 20:20:29 +02:00
Florian HENRY
ac41d76b22 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_dev_filter_from_dt_to_dt_actionlist 2021-10-07 20:19:38 +02:00
Gauthier PC portable 024
6fdd1c49f3 FIX : travis 2021-10-07 17:29:20 +02:00
Laurent Destailleur
17d2c3cb08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/website/class/websitepage.class.php
 2021-10-07 16:10:48 +02:00
Laurent Destailleur
b905b1b4bc FIX missing filter status=1 on rss feeds 2021-10-07 16:09:32 +02:00
Gauthier PC portable 024
4094d94bd6 FIX : travis 2021-10-07 14:41:15 +02:00
Gauthier PC portable 024
da52b00aef fix br 2021-10-07 14:32:16 +02:00
Gauthier PC portable 024
0a73b28742 FIX : travis 2021-10-07 14:18:03 +02:00
Gauthier PC portable 024
3740ae90f1 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-07 13:19:33 +02:00
Gauthier PC portable 024
12488f4a29 FIX : travis 2021-10-07 13:19:21 +02:00
stickler-ci
5e02548abb Fixing style errors. 2021-10-07 10:30:32 +00:00
Gauthier PC portable 024
92319464d8 FIX : travis 2021-10-07 12:27:52 +02:00
Laurent Destailleur
831c72411b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-07 11:35:58 +02:00
Laurent Destailleur
d245abe908 Fix rounding 2021-10-07 11:34:21 +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
Laurent Destailleur
68ac62d09c Fix phpcs 2021-10-07 11:05:06 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Laurent Destailleur
efd44b0ec0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-07 10:57:03 +02:00
Laurent Destailleur
5910d10021 Add hidden option to allow to fix corrupted situations 2021-10-07 10:43:50 +02:00
Laurent Destailleur
162d5d8a39 Fix protection of double party accounting when using situation invoices 2021-10-07 10:38:10 +02:00
lvessiller
da52ee55a4 FIX sickler-ci errors 2021-10-07 10:13:30 +02:00
lvessiller
cc21257e3e NEW print without details 2021-10-07 09:51:55 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Alexandre SPANGARO
24e3dd0992 Prepare sql 2021-10-07 06:05:36 +02:00
Laurent Destailleur
f8d4e2bbf9 Fix phpcs 2021-10-07 04:14:38 +02:00
Laurent Destailleur
ed6fefc493 Trans 2021-10-07 04:10:39 +02:00
Laurent Destailleur
ec545f8967 Fix data 2021-10-07 02:58:51 +02:00
Laurent Destailleur
5463a02887 Debug v14 2021-10-06 21:59:10 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
8fe37b20c0 Debug v14 2021-10-06 21:54:04 +02:00
Laurent Destailleur
2a5e654544 Debug v14 2021-10-06 21:47:46 +02:00
Laurent Destailleur
f95b0c3033 Debug 2021-10-06 21:43:30 +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
e1f5a39f48 Fix phpcs 2021-10-06 19:40:18 +02:00
Laurent Destailleur
e004d39ed4 Fix status of supplier invoice 2021-10-06 19:30:37 +02:00
Laurent Destailleur
ab78930476 Add api to post supplier proposal and supplier order documents 2021-10-06 18:50:29 +02:00
Laurent Destailleur
e228f07877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/mrp/lib/mrp_mo.lib.php
 2021-10-06 18:41:51 +02:00
Laurent Destailleur
88a482c615 Fix phpcs 2021-10-06 18:40:32 +02:00
Laurent Destailleur
144de734ce Fix phpcs 2021-10-06 18:39:16 +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
Gauthier PC portable 024
0d5f06743f Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:48:06 +02:00
Gauthier PC portable 024
2efea59614 FIX : db escape 2021-10-06 17:47:27 +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
Florian HENRY
f52e2be10e NEW:Add filter from date to date into action/evt list 2021-10-06 16:23:11 +02:00
Laurent Destailleur
1c53035e38 Doc 2021-10-06 16:19:36 +02:00
Laurent Destailleur
cb84eef6dc
Update shipment.php 2021-10-06 16:13:02 +02:00
Laurent Destailleur
4208964153
Merge branch 'develop' into patch-10 2021-10-06 16:09:54 +02:00
Laurent Destailleur
e3032ef1c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-10-06 16:06:25 +02:00
stickler-ci
528e4f87d1 Fixing style errors. 2021-10-06 13:59:03 +00:00
Gauthier PC portable 024
a271bb8316 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-06 15:56:11 +02:00
Gauthier PC portable 024
ad2844d2f0 FIX : cast int 2021-10-06 15:55:59 +02:00
Laurent Destailleur
ad1cb443e4
Merge pull request #18520 from cfoellmann/PR/pdf-no-template 
allow supplier order to not generate pdfs
 2021-10-06 15:35:08 +02:00
stickler-ci
fd7b8ae01a Fixing style errors. 2021-10-06 13:34:00 +00: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
Laurent Destailleur
a33ca7d528
Update admin.lang 2021-10-06 15:33:06 +02:00
Gauthier PC portable 024
2f329bf053 FIX : cast int 2021-10-06 15:31:32 +02:00
Laurent Destailleur
eba377cdf0
Merge pull request #18860 from FHenry/12_fix_selectline_from_supplier_order_to_supplier_invoice 
fix: Supplier order => Supplier Invoice : line selector (checkbox) wasn't working
 2021-10-06 15:31:14 +02:00
Laurent Destailleur
10f0434116
Update card.php 2021-10-06 15:30:19 +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
d5d892b263
Merge pull request #18831 from SteiniGreenwork/develop 
NEW Can select existing batch numbers for a combo list (in mrp consumtion)
 2021-10-06 15:20:52 +02:00
Gauthier PC portable 024
468b76e9d6 FIX : useless function 2021-10-06 15:15:22 +02:00
Laurent Destailleur
de49e4e375
Merge branch 'develop' into NEW_expense_report_project_required 2021-10-06 14:34:58 +02:00
Gauthier PC portable 024
23ffc1f4b5 FIX : useless function 2021-10-06 14:33:01 +02:00
Laurent Destailleur
6b5ab8025c
Update admin.lang 2021-10-06 14:30:47 +02:00
Laurent Destailleur
3c885c1fce Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-06 14:27:47 +02:00
Laurent Destailleur
92ae3c9d52 Fix label in graph 2021-10-06 14:26:48 +02:00
Gauthier PC portable 024
ea13b043ee FIX : travis 2021-10-06 14:21:02 +02:00
Laurent Destailleur
7a9eb0baa7
Merge pull request #18911 from ksar-ksar/patch-10 
FIX #18910 : MRP List SQL query syntax error with more than one extrafileds.
 2021-10-06 14:10:37 +02:00
Laurent Destailleur
4be2d1414e Fix regression 2021-10-06 14:03:10 +02:00
Laurent Destailleur
b93110e4f0
Merge pull request #18901 from xgerhard/disabled-button-zero-qty-fix 
Fix #18890 Fix disabled button if sum real qty is 0
 2021-10-06 13:49:12 +02:00
Laurent Destailleur
ba15907582
Update inventory.php 2021-10-06 13:48:42 +02:00
Laurent Destailleur
a984eb5c98
Merge branch 'develop' into 14_fix_api_priduct_warning 2021-10-06 13:43:18 +02:00
Laurent Destailleur
7b1b7c0ad6
Update api_products.class.php 2021-10-06 13:42:49 +02:00
Laurent Destailleur
5d9c87a9ea
Update api_products.class.php 2021-10-06 13:42:13 +02:00
Francis Appels
dceb2b5341 Fix fatal error 2021-10-06 13:36:11 +02:00
Rüdiger Hahn
d963aa8832 Allow removal of tabs 
For being able to remove or replace tabs, it is also necessary to call
this function with 'remove' mode.
 2021-10-06 13:35:34 +02:00
Laurent Destailleur
b630b15991 Add missing line to remove a tab in modulebuilder 2021-10-06 13:33:13 +02:00
Laurent Destailleur
d1eb55ea2d
Merge pull request #18897 from code-chicken/patch-13 
Allow removal of tabs
 2021-10-06 13:30:14 +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
89b2ecf504 Add missing migration sql 2021-10-06 13:28:05 +02:00
Laurent Destailleur
65ea165721 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-06 13:27:42 +02:00
Laurent Destailleur
0cf18ded80
Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +02:00
Laurent Destailleur
8f9a7f4e35
Update 13.0.0-14.0.0.sql 2021-10-06 13:26:42 +02:00
Laurent Destailleur
ea3e3b133d Debug eventorganization modules 2021-10-06 12:55:07 +02:00
Laurent Destailleur
ff29ac93ad Debug eventorganization modules 2021-10-06 12:43:40 +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
3709c6ff47 Fix phpcs 2021-10-06 11:53:27 +02:00
Laurent Destailleur
93b4853f8e Fix var_dump 2021-10-06 11:52:12 +02:00
ksar
6a20fcc5c0
FIX #18910 2021-10-06 11:24:42 +02:00
Florian HENRY
9d1915f9c2 fix php warning 2021-10-06 09:56:10 +02:00
Laurent Destailleur
36a00bc1ac Enhance selection of qty to transfer/correct stock 2021-10-05 20:42:52 +02:00
Laurent Destailleur
06eb138b47
Merge pull request #18902 from xgerhard/fix-negative-stock-correction 
Fix #18895 Fix negative stock correction
 2021-10-05 18:45:50 +02:00
Laurent Destailleur
e85a0c54cc
Update product.class.php 2021-10-05 18:43:35 +02:00
Laurent Destailleur
30ac1fbf01
Merge pull request #18904 from cfoellmann/PR/hook-beforebodyclose 
NEW add hook `beforeBodyClose`
 2021-10-05 16:52:46 +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
298f337f36 Revert "FIX : travis feedback" 
This reverts commit 1a651f089d.
 2021-10-05 16:45:18 +02:00
Gauthier PC portable 024
1a651f089d FIX : travis feedback 2021-10-05 16:38:20 +02:00
Marc de Lima Lucio
fdb6ebe80e FIX: postgresql: rename the oly column with uppercase characters to lowercase 2021-10-05 16:18:56 +02:00
Marc de Lima Lucio
88d93a4da5 FIX: expense reports: no need to delete const at project module activation 2021-10-05 15:59:29 +02:00
Gauthier PC portable 024
1d4d4dfe18 FIX : ihm 2021-10-05 15:43:57 +02:00
Gauthier PC portable 024
cf7def093f Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-05 15:21:53 +02:00
Gauthier PC portable 024
370af17894 FIX : ihm 2021-10-05 15:21:37 +02:00
stickler-ci
6c63020957 Fixing style errors. 2021-10-05 13:06:49 +00:00
Gauthier PC portable 024
5f0e09e1ef FIX : postgres adaptation 2021-10-05 15:04:15 +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
123c047e29 Fix look and feel v14 2021-10-05 13:34:25 +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
Gauthier PC portable 024
99f331c817 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-05 12:43:56 +02:00
Gauthier PC portable 024
bea17e8d78 FIX : travis + User::hasRight() function modification to take care of hrm specific rights 2021-10-05 12:42:42 +02:00
Laurent Destailleur
379dd9ccbb Fix position of text 2021-10-05 12:09:03 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00
stickler-ci
39cc2ca5b6 Fixing style errors. 2021-10-05 09:42:52 +00:00
stickler-ci
75182f40a0 Fixing style errors. 2021-10-05 09:37:38 +00: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
Gauthier PC portable 024
75c7502922 FIX : useless dol_include_once + travis feedback 2021-10-05 11:35:00 +02:00
Gauthier PC portable 024
5d179beaac FIX : several fixes + travis 2021-10-05 11:14:08 +02:00
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +02:00
Christian Foellmann
caf26d95d6 add hook beforeBodyClose 2021-10-05 10:41:11 +02:00
Laurent Destailleur
f0703b414a css 2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
1d2c8effd8 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:20:35 +02:00
Alexandre SPANGARO
f6a8082f16 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:01:37 +02:00
Alexandre SPANGARO
2e49eee106 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:52:45 +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
c57aea1ead HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:10:37 +02:00
Alexandre SPANGARO
b8a7f122ef HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:06:07 +02:00
Alexandre SPANGARO
d10ec688c7 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:03:13 +02:00
Laurent Destailleur
b559dc9053 css 2021-10-05 08:55:57 +02:00
Alexandre SPANGARO
463efd3802 Missing language key 2021-10-05 06:26:19 +02:00
Alexandre SPANGARO
e75d7b2206 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 06:25:53 +02:00
xgerhard
e44c3a46e1 Fix #18895 Fix negative stock correction 
If people use a negative number as input, I think we can assume they want to delete units. It will now set the movement to 1 if the number is negative and 'add' was selected.

For each negative number we now multiply this number by -1, to make it a positive number again.
 2021-10-05 00:25:52 +02:00
xgerhard
cbd825e526 FIX|Fix #18890 Fix disabled button if sum real qty is 0 
Instead of counting the sum of the 'real qty' input, only disable the button if no input has been given, or if all input is the same as the expected qty.

'$object->status' check seems unnecessary here since the button is only there when the status is 'STATUS_VALIDATED'.
 2021-10-05 00:03:00 +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
stickler-ci
ced7c24c40 Fixing style errors. 2021-10-04 17:25:13 +00:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php 2021-10-04 19:20:37 +02:00
Rüdiger Hahn
35aa9b0d35
Allow removal of tabs 
For being able to remove or replace tabs, it is also necessary to call this function with 'remove' mode.
 2021-10-04 19:19:12 +02:00
Laurent Destailleur
e14676be49 Fix phpunit 2021-10-04 19:09:38 +02:00
Laurent Destailleur
f7f8ff2df2
Merge pull request #18862 from marc-dll/NEW_expense_report_overlap_link 
NEW: expense report: show link to already existing overlapping expense report
 2021-10-04 15:37:49 +02:00
Laurent Destailleur
6f4c3cba6f
Merge pull request #18891 from stepanych/develop 
Fix #18875
 2021-10-04 15:33:13 +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
bad5d87f57 NEW theme option THEME_ELDY_USEBORDERONTABLE 2021-10-04 14:56:30 +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
stickler-ci
35e7a473f4 Fixing style errors. 2021-10-04 12:10:54 +00:00
Gauthier PC portable 024
0dd3681e50 FIX : several debug 2021-10-04 14:08:11 +02:00
Laurent Destailleur
6d8276c9c8 Doc 2021-10-04 12:59:53 +02:00
Laurent Destailleur
91ee704dc3 Move trans from admin to main 2021-10-04 12:16:50 +02:00
Laurent Destailleur
1c56f65c27 Fix missing migration instruction 2021-10-04 11:49:49 +02:00
Marc de Lima Lucio
704bae46a6 FIX: expense report: show link to already existing overlapping expense report without adding new parameter 2021-10-04 08:51:31 +02:00
Stephan Steininger
3bb941f3b8
Merge branch 'Dolibarr:develop' into develop 2021-10-04 08:12:19 +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
b6ec7ae77a Fix permissions on module PaymentByBankTransfer 2021-10-04 04:36:58 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
2c32c6c5c9 Fix contextpage for list of tickets 2021-10-03 19:17:23 +02:00
Laurent Destailleur
e558adbcfc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-03 18:20:34 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
stickler-ci
76ec8e0f25 Fixing style errors. 2021-10-03 10:37:31 +00:00
Gauthier PC portable 024
a6c854cb59 FIX : restore link to hrm establishment tab 2021-10-03 12:34:47 +02:00
Alexandre SPANGARO
42bb9ac6d2 Better URL 2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
94166cdb7e FIX Remove Isle of Man of ECC's countries 2021-10-03 05:36:53 +02:00
Alexandre SPANGARO
042d520061 Change Url 2021-10-03 05:30:49 +02:00
stepanych
b1eb1c1070 fix issue #18875 
added check for $$search_array_options
 2021-10-03 01:08:22 +02:00
Laurent Destailleur
2f813e0b6a
Merge pull request #18832 from atm-gauthier/NEW/integration_GPEC_sql 
NEW : integration HRM sql and migration files
 2021-10-02 21:18:50 +02:00
Laurent Destailleur
705644bf07
Merge branch 'develop' into NEW_expense_report_prefill_dates 2021-10-02 21:11:59 +02:00
Laurent Destailleur
a5daf9de9d
Update admin.lang 2021-10-02 21:09:03 +02:00
Laurent Destailleur
4c6f2fc4b5
Merge pull request #18874 from OPEN-DSI/v14-fix-product-per-entity-portability-sql 
FIX Product accountancy affectation with product_perentity activated …
 2021-10-02 21:04:11 +02:00
Laurent Destailleur
e5c5d8d755
Merge pull request #18878 from frederic34/patch-4 
doxygen
 2021-10-02 21:00:39 +02:00
Laurent Destailleur
1a8cb9c4b5
Merge pull request #18864 from marc-dll/NEW_expense_report_force_amounts_including_taxes 
NEW: expense reports: conf to force amounts to be entered only including taxes
 2021-10-02 21:00:29 +02:00
Laurent Destailleur
f479c2bc77
Merge pull request #18868 from frederic34/patch-1 
Fix migration Update 14.0.0-15.0.0.sql
 2021-10-02 20:50:10 +02:00
Laurent Destailleur
c149af82fe
Merge pull request #18873 from JR-Polyline/patch-1 
Fix dynamic prices not updating
 2021-10-02 20:45:16 +02:00
Laurent Destailleur
dd68e8c36e
Merge pull request #18877 from frederic34/patch-2 
doxygen
 2021-10-02 20:44:15 +02:00
Laurent Destailleur
c4ca0bdc28
Merge pull request #18879 from frederic34/patch-5 
doxygen
 2021-10-02 20:44:09 +02:00
Laurent Destailleur
2483cc7965 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-02 20:43:30 +02:00
Laurent Destailleur
55e97784bd FIX #18880 2021-10-02 20:42:54 +02:00
Laurent Destailleur
dfb1b1636f
Merge pull request #18881 from frederic34/patch-6 
doxygen
 2021-10-02 20:38:55 +02:00
Laurent Destailleur
084b6e3bd7
Merge pull request #18883 from frederic34/patch-8 
doxygen
 2021-10-02 20:38:49 +02:00