Commit Graph

94729 Commits

Author SHA1 Message Date
UT from dolibit
09b4d9d20a
Update robots.txt
add  Allow: /public/members/new.php
2021-01-18 14:45:32 +01:00
lmarcouiller
841736df87 Fix #15970 user.class.php 2021-01-18 14:20:30 +01:00
Laurent Destailleur
a109dd8948 Fix removed unexpected values in stats graph
Conflicts:
	htdocs/projet/graph_opportunities.inc.php
2021-01-18 13:55:11 +01:00
Laurent Destailleur
b46d1fa6a1 Fix removed unexpected values in stats graph 2021-01-18 13:51:35 +01:00
Laurent Destailleur
512745920a css 2021-01-18 13:47:29 +01:00
Laurent Destailleur
5a4ab3d00e Fix look and feel v13 2021-01-18 12:07:40 +01:00
stickler-ci
fe01f35207 Fixing style errors. 2021-01-18 10:33:46 +00:00
lmarcouiller
383281e5f3 New update of funnel of prospection 2021-01-18 11:32:02 +01:00
Laurent Destailleur
d5fd07e478 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-18 11:07:55 +01:00
Laurent Destailleur
250b530b29 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
2021-01-18 11:07:46 +01:00
Laurent Destailleur
c69631d646 Fix css for multiselect component that are fist hidden 2021-01-18 11:05:02 +01:00
Florian HENRY
58eeb7152b Merge branch '12.0' into 13.0 2021-01-18 09:19:05 +01:00
Florian HENRY
c4f8e81d5d better fix 2021-01-18 09:18:42 +01:00
Florian HENRY
21429622d6 Merge branch '12.0' into 13.0 2021-01-18 09:16:48 +01:00
Florian HENRY
1cd0f71c09 Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0 2021-01-18 09:12:29 +01:00
Florian HENRY
33a0cf078c better fix 2021-01-18 09:12:23 +01:00
Florian HENRY
014d3cc114 better fix 2021-01-18 09:08:54 +01:00
Florian HENRY
1eec6fbb8f Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-01-18 09:05:12 +01:00
Frédéric FRANCE
171a4e7935
fix variable declaration
The variable $label seems to be never defined.
The variable $label does not seem to be defined for all execution paths leading up to this point.
2021-01-18 08:09:12 +01:00
Frédéric FRANCE
83b7e3c678
fix unknown variable 2021-01-18 08:01:18 +01:00
Frederick Jost Zweig
267caf7ac8 Added 'US-BASE' and 'CA-ENG-BASE' to models list
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
2021-01-18 02:22:23 +01:00
Frederick Jost Zweig
ed796cd500 Removed 'pcg_subtype' column
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
2021-01-18 02:22:16 +01:00
Laurent Destailleur
c248bd0e9e
Merge pull request #15998 from Fred-Zweig/develop
Fix the 'US-BASE' and 'CA-ENG-BASE' chart of accounts
2021-01-18 02:21:44 +01:00
Frederick Jost Zweig
5466bcc512
Added 'US-BASE' and 'CA-ENG-BASE' to models list
Added 'US-BASE' and 'CA-ENG-BASE' chart of accounts names to the 'Chart of accounts models' list.
2021-01-17 22:46:23 +02:00
Frederick Jost Zweig
6c5c0dfc18
Removed 'pcg_subtype' column
The 'pcg_subtype' column of the table 'llx_accounting_account' has been removed in recent Dolibarr versions, so it has to be removed in this file also. Otherwise, the US chart of account can't be enabled.
2021-01-17 22:33:47 +02:00
Frédéric FRANCE
f71d803da8
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-17 20:21:05 +01:00
Laurent Destailleur
350d4638da Prepare v13 2021-01-17 18:50:50 +01:00
Anthony Berton
bb1af10cf1 warehouse thirparty affect on proposal or order 2021-01-17 16:48:51 +01:00
Laurent Destailleur
62300689f8 Fix look and feel v13 2021-01-17 15:59:04 +01:00
Laurent Destailleur
2859070c5c Fix filet on extrafields date 2021-01-17 15:47:43 +01:00
Laurent Destailleur
69e0973c72 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:50:12 +01:00
Laurent Destailleur
47b90ab400 Fix duplicate log 2021-01-17 12:49:37 +01:00
Laurent Destailleur
cdab7041c4 Fix duplicate log 2021-01-17 12:49:01 +01:00
Laurent Destailleur
3cec156158 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:22:10 +01:00
Laurent Destailleur
e3335b5b2c Fix bad class 2021-01-17 12:21:27 +01:00
Laurent Destailleur
05f0576b24 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:18:11 +01:00
Laurent Destailleur
d16e221087 Fix popup 2021-01-17 12:16:56 +01:00
Laurent Destailleur
e7a77525ca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-17 12:02:42 +01:00
Laurent Destailleur
10ee98c452 Fix tooltip 2021-01-17 12:02:15 +01:00
Laurent Destailleur
1fe6eccb1c css 2021-01-17 11:46:41 +01:00
Laurent Destailleur
4d42fa2a37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formaccounting.class.php
2021-01-17 11:34:19 +01:00
Laurent Destailleur
314cc45c81 Fix message 2021-01-17 11:24:24 +01:00
stickler-ci
93b421238a Fixing style errors. 2021-01-17 01:26:09 +00:00
Anthony Berton
89ac5e8803 1 2021-01-17 02:09:21 +01:00
Anthony Berton
daf472b781 Update card.php 2021-01-17 00:15:32 +01:00
stickler-ci
af169ac700 Fixing style errors. 2021-01-16 22:49:15 +00:00
Anthony Berton
57f4ac2072 Update list.php 2021-01-16 23:41:06 +01:00
Laurent Destailleur
ee4084ef1b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/product/card.php
2021-01-16 19:09:46 +01:00
Laurent Destailleur
a4109d3fd0
Merge pull request #15600 from Hystepik/develop#2
Close #15384 : New widget stat database
2021-01-16 18:42:50 +01:00
Frédéric FRANCE
b511f00cda
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-16 18:38:41 +01:00