Laurent Destailleur
|
d0f22c7bff
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
|
2020-03-06 14:22:42 +01:00 |
|
Laurent Destailleur
|
d4b67a6cef
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contrat/list.php
htdocs/core/lib/functions.lib.php
|
2020-03-06 14:19:30 +01:00 |
|
Laurent Destailleur
|
aaf9aef5c8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/contrat/list.php
|
2020-03-06 14:17:21 +01:00 |
|
ATM-Nicolas
|
a9d7bbc2ed
|
FIX : Remove unexisting link
|
2020-03-06 09:52:19 +01:00 |
|
Laurent Destailleur
|
0ba2c53b02
|
Fix translation of graph
|
2020-03-06 01:42:42 +01:00 |
|
Laurent Destailleur
|
0bd2740779
|
NEW Can force position of legend of graph on right (instead of top)
|
2020-03-05 17:23:19 +01:00 |
|
Laurent Destailleur
|
85c1e2a670
|
Fix regression css
|
2020-03-05 03:20:06 +01:00 |
|
Laurent Destailleur
|
fc31680bd0
|
Several fix for chart.js graphs
|
2020-03-05 02:55:06 +01:00 |
|
Laurent Destailleur
|
7866f89585
|
Merge pull request #13260 from atm-quentin/FIX_ecm_files
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 23:09:02 +01:00 |
|
atm-quentin
|
9446138951
|
FIX ecm_files didnt match cause document ref contained "/"
|
2020-03-03 12:07:18 +01:00 |
|
Laurent Destailleur
|
0646b1a7a9
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ihm.php
|
2020-02-26 17:04:14 +01:00 |
|
Laurent Destailleur
|
ef9fe73d96
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/compta/index.php
|
2020-02-26 17:02:23 +01:00 |
|
gauthier
|
01b9c42670
|
FIX : timezone must be tzserver and not tzuser as well as on contract card
|
2020-02-26 15:02:42 +01:00 |
|
Laurent Destailleur
|
be3ecb3093
|
Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless
|
2020-02-21 14:32:53 +01:00 |
|
Laurent Destailleur
|
52c7f908a0
|
Doxygen
|
2020-02-20 14:02:27 +01:00 |
|
Laurent Destailleur
|
b41c1c10a0
|
Fix doxygen
|
2020-02-20 13:00:27 +01:00 |
|
Laurent Destailleur
|
74d3912763
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2020-02-11 16:52:58 +01:00 |
|
Laurent Destailleur
|
ee7aa14247
|
Fix color of status
|
2020-02-10 21:28:49 +01:00 |
|
Laurent Destailleur
|
9fdef6858b
|
Remove code using a no more used field
|
2020-02-07 13:37:37 +01:00 |
|
Laurent Destailleur
|
4e4fd4c76c
|
Remove code using a no more used field
|
2020-02-07 13:15:51 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
e796a2eda9
|
Add fields array on common objects
|
2020-01-29 22:38:14 +01:00 |
|
Laurent Destailleur
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
3a9e238dc6
|
FIX Missing value of $formconfirm as parameters of hook
|
2020-01-28 12:00:27 +01:00 |
|
Laurent Destailleur
|
df478dc170
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-27 01:53:49 +01:00 |
|
Laurent Destailleur
|
7438f92912
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
|
2020-01-27 01:50:02 +01:00 |
|
Laurent Destailleur
|
8ff19a2a0f
|
WIP search component
|
2020-01-26 22:02:31 +01:00 |
|
Laurent Destailleur
|
6b30a6ad1f
|
Fix modulebuilder
|
2020-01-25 19:30:12 +01:00 |
|
Laurent Destailleur
|
ee6952e66f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-25 19:22:42 +01:00 |
|
Laurent Destailleur
|
12556aa835
|
Fix modulebuilder
|
2020-01-25 19:21:37 +01:00 |
|
Laurent Destailleur
|
9ecf6127c6
|
Add array fields for contracts
|
2020-01-25 19:02:36 +01:00 |
|
Laurent Destailleur
|
0f2141269a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-01-25 14:43:57 +01:00 |
|
Laurent Destailleur
|
09f809f347
|
FIX #12913
|
2020-01-25 14:03:24 +01:00 |
|
atm-greg
|
f63893a90c
|
FIX date filter not used if no operator
|
2020-01-24 15:10:57 +01:00 |
|
Frédéric FRANCE
|
3ce077320c
|
retrieve extrafields oldline when updating line
|
2020-01-22 10:23:31 +01:00 |
|
Laurent Destailleur
|
18f2b09fb1
|
Debug v11
|
2020-01-20 12:25:25 +01:00 |
|
Laurent Destailleur
|
e2e06b47ff
|
FIX #12617
|
2020-01-13 15:58:03 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Frédéric FRANCE
|
2b86955890
|
Update contrat.class.php
|
2019-12-10 19:44:20 +01:00 |
|
Frédéric FRANCE
|
b5c5b4e765
|
Update contrat.class.php
|
2019-12-10 18:55:22 +01:00 |
|
Frédéric FRANCE
|
3762bbd643
|
do not trim int
|
2019-12-10 18:46:07 +01:00 |
|
Laurent Destailleur
|
6f7343b14f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-02 11:01:26 +01:00 |
|
Laurent Destailleur
|
6d81bc77cb
|
Fix look and feel v11
|
2019-12-02 11:00:09 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
Frédéric FRANCE
|
45c537707f
|
The variable $db seems to be never defined.
|
2019-11-28 22:39:41 +01:00 |
|
Laurent Destailleur
|
fb70893229
|
Fix missing class reposition
|
2019-11-19 21:29:49 +01:00 |
|
Scrutinizer Auto-Fixer
|
1648fc142e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:24:29 +00:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Scrutinizer Auto-Fixer
|
ac40dd8bbe
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:39 +00:00 |
|
Scrutinizer Auto-Fixer
|
c85e54b08c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-12 08:46:08 +00:00 |
|
Scrutinizer Auto-Fixer
|
df664e790b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 23:15:34 +00:00 |
|
Philippe GRAND
|
2eade41de9
|
add some comment
|
2019-11-10 11:07:47 +01:00 |
|
Frédéric FRANCE
|
001010d5e3
|
fix phpcs
|
2019-11-07 12:43:33 +01:00 |
|
Laurent Destailleur
|
84b83229d6
|
Merge branch 'develop' into patch-6
|
2019-11-07 11:20:47 +01:00 |
|
Laurent Destailleur
|
4433cff49d
|
Merge pull request #12346 from frederic34/centpercent
100% centpercent
|
2019-11-07 10:39:09 +01:00 |
|
Laurent Destailleur
|
b3feb6b095
|
Fix lang not defined
|
2019-11-06 00:42:29 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Frédéric FRANCE
|
f3154566a4
|
Update index.php
|
2019-11-05 19:03:28 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Laurent Destailleur
|
6e591d2be0
|
Fix css
|
2019-11-04 18:25:32 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
Laurent Destailleur
|
666e60a883
|
Responsive
|
2019-11-04 11:40:54 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
135e65c4aa
|
Look and feel v11
Enhance the progress bar of tasks
|
2019-11-01 15:53:57 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
20f97807ce
|
clean indent
|
2019-10-27 10:07:47 +01:00 |
|
Frédéric FRANCE
|
635306c084
|
restore original rules to be mergeable without errors
|
2019-10-26 18:23:51 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
e07e01580d
|
Replace deprecated code with new one
|
2019-10-16 03:34:32 +02:00 |
|
Laurent Destailleur
|
5056d7220b
|
Fix multicurrency not yet supported on contracts
|
2019-10-14 15:36:28 +02:00 |
|
Frédéric FRANCE
|
ae62d3d60a
|
Update list.php
|
2019-10-08 18:43:22 +02:00 |
|
Laurent Destailleur
|
43a70e5548
|
Clean code to use the new $extrafields->attributes array
|
2019-10-08 09:28:50 +02:00 |
|
Frédéric FRANCE
|
0b9213f4f1
|
Update contrat.class.php
|
2019-10-07 08:11:23 +02:00 |
|
Laurent Destailleur
|
866dcf18fe
|
Look and feel v11
|
2019-10-06 15:34:22 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
fec67aade4
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 18:44:34 +02:00 |
|
Laurent Destailleur
|
b28cd1bb57
|
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 15:26:28 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Laurent Destailleur
|
86e5465197
|
Standardize extrafields code
|
2019-09-28 10:55:09 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Frédéric FRANCE
|
61e358bb9d
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-18 21:23:26 +02:00 |
|
Laurent Destailleur
|
2286cc2a5f
|
Fix autojump when 1 record found
|
2019-09-18 20:16:39 +02:00 |
|
Frédéric FRANCE
|
c9c7d60fc0
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-14 16:37:10 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Frédéric FRANCE
|
bd4c9a64a8
|
wip
|
2019-09-07 14:48:25 +02:00 |
|
Laurent Destailleur
|
f12a012932
|
Update card.php
|
2019-09-06 23:25:40 +02:00 |
|
Regis Houssin
|
369961b376
|
FIX avoid Warning: A non-numeric value encountered
|
2019-09-06 11:55:41 +02:00 |
|
Laurent Destailleur
|
529dd05226
|
Replace deprecated code
|
2019-09-06 10:53:05 +02:00 |
|
Laurent Destailleur
|
4a19f510fd
|
Fix scrutinizer reports
|
2019-09-05 13:58:35 +02:00 |
|
Laurent Destailleur
|
98459363df
|
Merge pull request #11795 from jtraulle/fix-doxygen-examples
Fix Wrongly catched examples by Doxygen
|
2019-09-03 12:45:23 +02:00 |
|
Laurent Destailleur
|
a269082d70
|
Replace deprecated code with new one
|
2019-09-02 03:58:00 +02:00 |
|
Jean Traullé
|
c32c7d48ba
|
Fix Wrongly catched examples by Doxygen
|
2019-08-30 17:14:59 +02:00 |
|
Laurent Destailleur
|
a5c43b42c3
|
Add a protection when we have several records
|
2019-08-23 13:28:26 +02:00 |
|