Commit Graph

94616 Commits

Author SHA1 Message Date
Frédéric FRANCE
fb4aea8223
Update card.php 2021-02-09 18:02:41 +01:00
Frédéric FRANCE
075d2c3ded
remove deprecated 2021-02-09 17:58:59 +01:00
Laurent Destailleur
21558dd0a6 Debug and enhance the feature to assign tasks on project assignation 2021-02-09 17:52:33 +01:00
Laurent Destailleur
1b129831a9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/projet/element.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
1c99eaedbc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:00:11 +01:00
Laurent Destailleur
4a97690f78 Add a check on syntax of hostname for email colector 2021-02-09 13:59:00 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact
NEW: When add contact/user to Project, ask to also affect on Tasks
2021-02-09 13:43:08 +01:00
Laurent Destailleur
a84bc05f01
Merge pull request #16146 from FHenry/12_fix_pricemin_PRODUIT_CUSTOMER_PRICES
FIX: manage price min for PRODUIT_CUSTOMER_PRICES
2021-02-09 13:39:25 +01:00
Laurent Destailleur
71f64c285f
Merge pull request #16171 from OPEN-DSI/new-ficheinter-create-from-origin-choose-lines
NEW choose lines while creating intervention card from origin
2021-02-09 13:38:48 +01:00
Laurent Destailleur
e62adb3869
Merge pull request #16224 from FHenry/dev_fix_continue
Dev fix continue
2021-02-09 13:32:44 +01:00
Laurent Destailleur
4d4a92b567
Merge pull request #16226 from frederic34/patch-2
remove deprecated
2021-02-09 13:31:36 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
2021-02-09 13:29:40 +01:00
Frédéric FRANCE
e2d2048522
deprecate non camelCaps functions 2021-02-09 13:25:55 +01:00
Laurent Destailleur
5e9065390a
Merge pull request #16228 from FHenry/dev_new_autoload_product_extrafield_line_createtpl
NEW:add hidden option to auto load input line extrafield into new lines
2021-02-09 13:24:53 +01:00
Laurent Destailleur
3b0268424b
Merge pull request #16227 from grandoc/new_branch_08_02_2021
Save the name of generated file as the main doc when generating a doc…
2021-02-09 13:24:02 +01:00
Laurent Destailleur
a5386246cd
Merge pull request #16225 from frederic34/facturerec
clean deprecated modelpdf to model_pdf
2021-02-09 13:23:25 +01:00
Laurent Destailleur
1efee54541
Merge pull request #16230 from FHenry/12_fix_error_assignement
12 fix error assignement
2021-02-09 13:22:57 +01:00
Laurent Destailleur
842e112c5b
Merge pull request #16229 from frederic34/patch-3
doxygen
2021-02-09 13:22:15 +01:00
Laurent Destailleur
d33de3ebc1
Merge pull request #16234 from davidNDU/clone/develop
Module builder: Don't delete hidden .tx-folder
2021-02-09 13:21:55 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions 2021-02-09 13:10:11 +01:00
David Bensel
a0bbe210a3 Module builder: Don't delete hidden .tx-folder 2021-02-09 14:45:06 +03:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
0da942210f
deprecate non camelCaps functions 2021-02-09 09:55:48 +01:00
Frédéric FRANCE
fe9ee5a398
deprecate non camelCaps functions 2021-02-09 09:49:37 +01:00
Frédéric FRANCE
6d961a1f79
deprecate non camelCaps functions 2021-02-09 09:40:07 +01:00
Frédéric FRANCE
a3e7c9d4b0
deprecate non camelCaps functions 2021-02-09 09:30:00 +01:00
Frédéric FRANCE
5f8b70b772
use camelCaps name 2021-02-09 09:03:29 +01:00
Frédéric FRANCE
266b217675
add var def in commondocgenerator 2021-02-09 08:35:22 +01:00
Laurent Destailleur
8acc5e1486 Fix calculation of profit 2021-02-08 23:37:32 +01:00
Laurent Destailleur
c9f34cc0d4 Prepare button to the bank conciliation pages 2021-02-08 22:42:21 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
2021-02-08 22:13:50 +01:00
Laurent Destailleur
9453caa5be Avoid message when not required 2021-02-08 22:12:12 +01:00
Frédéric FRANCE
bca986d924
Merge branch 'develop' into patch-2 2021-02-08 21:05:05 +01:00
Florian HENRY
6bcb63c53d fix indent 2021-02-08 20:46:59 +01:00
Florian HENRY
ff6b5c768d fix indent 2021-02-08 20:46:21 +01:00
Florian HENRY
dbbebba497 this->errors is set on triggers action must be set by callers 2021-02-08 20:44:40 +01:00
Frédéric FRANCE
b602a1b4a7
Update paiement_vat.php 2021-02-08 20:29:09 +01:00
Frédéric FRANCE
1a4c627ad8
doxygen 2021-02-08 20:25:51 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec 2021-02-08 20:21:46 +01:00
Laurent Destailleur
5966e63120 Fix css 2021-02-08 20:01:10 +01:00
Florian HENRY
1e6144a99d fix indent 2021-02-08 19:59:18 +01:00
Laurent Destailleur
af4d3767ea css 2021-02-08 19:56:38 +01:00
Florian HENRY
b6b736c402 NEW:add hidden option to auto load input line extrafield into new lines 2021-02-08 19:56:34 +01:00
Laurent Destailleur
d41edfc812 Fix responsive. Clean code 2021-02-08 19:52:29 +01:00
Philippe GRAND
f27dd77cb6 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:47:31 +01:00
Philippe GRAND
62d6666927 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:46:09 +01:00
Philippe GRAND
d9eb727c0f Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:44:46 +01:00
Philippe GRAND
f80da203e0 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:43:36 +01:00
Philippe GRAND
6b0bb90ab2 Save the name of generated file as the main doc when generating a doc with this template 2021-02-08 19:40:27 +01:00