Commit Graph

101328 Commits

Author SHA1 Message Date
stickler-ci
1043bc964d Fixing style errors. 2021-09-06 12:58:06 +00:00
Gauthier PC portable 024
383c92f6c6 FIX : migration script 2021-09-06 14:52:11 +02:00
Gauthier PC portable 024
be1c08ddfe FIX : salary extrafields don't work and table is not well named 2021-09-06 12:30:39 +02:00
Laurent Destailleur
b782e5986a Fix css 2021-09-06 03:29:46 +02:00
Laurent Destailleur
e4767e91ea Fix css 2021-09-06 03:26:43 +02:00
Laurent Destailleur
5850b68f79 Fix css 2021-09-06 03:22:06 +02:00
Laurent Destailleur
b58684af98 Fix trans 2021-09-05 14:31:33 +02:00
Laurent Destailleur
5b9a583005 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-04 13:53:46 +02:00
Laurent Destailleur
4e7549ab7d css 2021-09-04 13:53:31 +02:00
Laurent Destailleur
87b33c09e0
Merge pull request #18595 from FHenry/14_eventorg
NEW : Can register an attendees on project global (and also on conférence)
2021-09-03 20:50:21 +02:00
Laurent Destailleur
2e3b6b2fc8 Backport sql injection fix from develop 2021-09-03 18:00:28 +02:00
Florian HENRY
628c715878 ok for prod 2021-09-03 16:39:10 +02:00
Florian HENRY
96f9f8ae98 work on event 2021-09-03 15:40:33 +02:00
Laurent Destailleur
531037ddb6 Prepare 14.0.2 2021-09-03 11:04:49 +02:00
Laurent Destailleur
35e5480f2f Fix var init 2021-09-03 10:58:43 +02:00
henrynopo
4c1d857991 Update remx.php 2021-09-02 19:36:48 +02:00
henrynopo
6e5258f482 Update stocks.lang 2021-09-02 19:26:32 +02:00
Laurent Destailleur
9ec5470adf
Merge pull request #18583 from ksar-ksar/patch-7
FIX #18565
2021-09-02 17:36:07 +02:00
ksar
260049c917
FIX #18565 2021-09-02 17:15:57 +02:00
Laurent Destailleur
7758c0b8a7 Fix phpcs 2021-09-02 16:06:19 +02:00
Laurent Destailleur
e22bd5c048 Fix better format address for jp in romaji 2021-09-02 10:39:56 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
03cfea2504 Fix const setup 2021-09-01 19:06:58 +02:00
Laurent Destailleur
7c7e89cc3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 18:41:44 +02:00
Laurent Destailleur
831a66465f Fix trans 2021-09-01 18:28:21 +02:00
Christian Foellmann
f391b11da7 fix product nature on create 2021-09-01 18:23:38 +02:00
Laurent Destailleur
82d99bfa01
Merge pull request #18546 from lainwir3d/fix_restapi_order_mail_substitutes
FIX #18544 Shipment rest api: load thirdparty object when validating
2021-09-01 18:19:11 +02:00
Laurent Destailleur
f0a68d728a
Merge pull request #18548 from henrynopo/patch-17
Fix error of SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED
2021-09-01 18:17:37 +02:00
Laurent Destailleur
7e8ce82e0a
Merge pull request #18543 from lainwir3d/fix_restapi_global_user_variable
FIX #18542 REST API: set global $user variable to DolibarrApiAccess::user
2021-09-01 18:05:40 +02:00
Laurent Destailleur
0f325bdd65
Update api_access.class.php 2021-09-01 18:05:24 +02:00
Laurent Destailleur
82d878dd7a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 17:59:07 +02:00
Laurent Destailleur
74f3b98ea9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2021-09-01 17:54:21 +02:00
Laurent Destailleur
3e4d7dfaba Fix $_SERVER["PHP_SEFL"] into $_SERVER["PHP_SELF"] 2021-09-01 17:44:54 +02:00
Laurent Destailleur
443827ff42 FIX #18531 2021-09-01 17:10:26 +02:00
Laurent Destailleur
b66bd781a4 Clean code 2021-09-01 16:26:59 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
Laurent Destailleur
1027f1059e
Merge pull request #18574 from FHenry/14_eventorg
fix: disabled module Event Org when project disabled
2021-09-01 16:17:55 +02:00
Laurent Destailleur
14ca7db5d7 Typo in log 2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f regroup BILL_SUPPLIER_VALIDATE actions
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249 Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-09-01 16:06:36 +02:00
Florian HENRY
bb6dda087c Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_eventorg 2021-09-01 15:23:04 +02:00
Florian HENRY
bae73b9a52 disabled module on inactive 2021-09-01 15:16:11 +02:00
Laurent Destailleur
375557e092 FIX Menu List of project was not visible. 2021-09-01 15:10:02 +02:00
Laurent Destailleur
cd09099409
Merge pull request #18563 from atm-maxime/patch-3
Fix supplier invoice pdf generation canelle
2021-09-01 13:37:50 +02:00
Laurent Destailleur
fb0bd41178 Fix trans 2021-09-01 13:02:36 +02:00
Laurent Destailleur
bcd835ddbd Fix tooltips 2021-09-01 12:34:59 +02:00
Laurent Destailleur
a48473ba7a Missing trans exclude 2021-09-01 12:22:44 +02:00
Laurent Destailleur
da8dcaa0c9 Fix look and feel v14 2021-09-01 12:15:23 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00