Laurent Destailleur
|
6f12488e30
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2020-06-07 19:55:48 +02:00 |
|
Laurent Destailleur
|
2a1d547267
|
Celan dead code
|
2020-06-07 18:44:37 +02:00 |
|
Laurent Destailleur
|
88aaec63f7
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-06 18:57:41 +02:00 |
|
Laurent Destailleur
|
e31e889595
|
Add url in error message
|
2020-06-06 18:30:04 +02:00 |
|
Laurent Destailleur
|
bd56210e97
|
doc
|
2020-06-03 19:24:26 +02:00 |
|
Laurent Destailleur
|
7f1fea1e09
|
Add json-ld structure 'qa'
|
2020-06-03 19:23:36 +02:00 |
|
Laurent Destailleur
|
474860d546
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-03 14:06:35 +02:00 |
|
Laurent Destailleur
|
7b84518e59
|
Fix webp support
|
2020-06-03 14:05:18 +02:00 |
|
Laurent Destailleur
|
a37a4031e9
|
FIX Delete of website page need permission. Conflict with mass action.
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/index.php
|
2020-06-03 01:02:19 +02:00 |
|
Laurent Destailleur
|
d4db1836d1
|
FIX Delete of website page need permission. Conflict with mass action.
|
2020-06-03 00:46:09 +02:00 |
|
Laurent Destailleur
|
838a13cec1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-01 02:41:11 +02:00 |
|
Laurent Destailleur
|
e83b754e6f
|
Debug modulebuilder
|
2020-05-31 23:32:36 +02:00 |
|
Laurent Destailleur
|
f63aa7f527
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
|
2020-05-31 23:27:20 +02:00 |
|
Laurent Destailleur
|
3349144f5e
|
Fix lose enabled and default when editing field signatures in
modulebuilder
|
2020-05-31 23:23:42 +02:00 |
|
Laurent Destailleur
|
9224061aed
|
Fix test to upload a file
|
2020-05-29 03:20:44 +02:00 |
|
Laurent Destailleur
|
2836368017
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
|
2020-05-28 20:20:39 +02:00 |
|
Laurent Destailleur
|
1838cf92ef
|
Look and feel v12
|
2020-05-28 11:51:49 +02:00 |
|
Laurent Destailleur
|
a2a15ceb5b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/core/class/html.form.class.php
|
2020-05-27 23:07:18 +02:00 |
|
Laurent Destailleur
|
e37e45f984
|
Debug credit transfer
|
2020-05-27 22:35:55 +02:00 |
|
Laurent Destailleur
|
16625af34e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/files.lib.php
htdocs/core/tpl/filemanager.tpl.php
|
2020-05-27 14:28:20 +02:00 |
|
Laurent Destailleur
|
3ef1ca1764
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/ecm/class/ecmfiles.class.php
htdocs/ecm/index.php
|
2020-05-27 14:24:03 +02:00 |
|
Laurent Destailleur
|
a207365bd2
|
FIX XSS using the renaming of .noexe files - reported by Nolan.
|
2020-05-27 13:12:18 +02:00 |
|
Laurent Destailleur
|
c0ce584487
|
Look and feel v12
|
2020-05-27 00:26:04 +02:00 |
|
Laurent Destailleur
|
c607c2daa0
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-26 22:31:47 +02:00 |
|
Laurent Destailleur
|
91ecd3455f
|
Fix CSS
|
2020-05-26 22:30:11 +02:00 |
|
Laurent Destailleur
|
05ac3de2f0
|
Enhance search / filter
|
2020-05-26 12:46:51 +02:00 |
|
Laurent Destailleur
|
2d30d33303
|
NEW Can filter on container type, language and tags in the list of pages
of website module.
|
2020-05-26 12:25:41 +02:00 |
|
Laurent Destailleur
|
40816c02ce
|
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-25 22:40:59 +02:00 |
|
Laurent Destailleur
|
d08fc174c4
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-25 22:23:51 +02:00 |
|
Laurent Destailleur
|
2fe8e03ed6
|
Fix missing quote
|
2020-05-25 22:23:22 +02:00 |
|
Laurent Destailleur
|
41d5d9b6f8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-25 22:21:52 +02:00 |
|
Laurent Destailleur
|
ba047428e2
|
Fix duplicate \n
|
2020-05-25 22:21:36 +02:00 |
|
Laurent Destailleur
|
17382051c2
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-25 22:19:50 +02:00 |
|
Laurent Destailleur
|
19bcdb6418
|
Fix structured data
|
2020-05-25 22:19:28 +02:00 |
|
Laurent Destailleur
|
056206098b
|
CSS
|
2020-05-25 12:51:17 +02:00 |
|
Laurent Destailleur
|
9e77dc0a26
|
CSS
|
2020-05-25 12:50:29 +02:00 |
|
Frédéric FRANCE
|
174ddc5fd4
|
prepare new rule
|
2020-05-23 21:07:47 +02:00 |
|
Frédéric FRANCE
|
5aa84c64d0
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:54:33 +02:00 |
|
Frédéric FRANCE
|
2085ac73e7
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-23 18:34:58 +02:00 |
|
Laurent Destailleur
|
8e113888d8
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 17:02:27 +02:00 |
|
Laurent Destailleur
|
64f72daa7e
|
Fix hreflang if canonical page
|
2020-05-23 17:01:22 +02:00 |
|
Laurent Destailleur
|
aec5200a98
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/variants/class/ProductCombination.class.php
|
2020-05-23 15:37:00 +02:00 |
|
Laurent Destailleur
|
7c92bb218e
|
Fix no hreflang if not a canonical page
|
2020-05-23 15:33:04 +02:00 |
|
Laurent Destailleur
|
acaab1fd45
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 13:49:15 +02:00 |
|
gael.langlais
|
af5de05a31
|
Change some curly braces #13929
|
2020-05-23 13:38:50 +02:00 |
|
Laurent Destailleur
|
d4b1485c97
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 13:11:30 +02:00 |
|
Laurent Destailleur
|
755c47f900
|
Fix save of wrapper missing
|
2020-05-23 13:10:33 +02:00 |
|
Laurent Destailleur
|
333ae9d496
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-23 12:58:18 +02:00 |
|
Laurent Destailleur
|
f2c02f5559
|
FIX Language for RSS
|
2020-05-23 12:41:06 +02:00 |
|
Frédéric FRANCE
|
0f4f727d18
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-22 08:27:12 +02:00 |
|
Laurent Destailleur
|
5d78f6dac5
|
NEW Add link to edit property from search result of website pages
|
2020-05-22 00:38:01 +02:00 |
|
Frédéric FRANCE
|
5940d3705a
|
add new rule
|
2020-05-21 16:00:12 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
ee6fadd0d5
|
add new rule
|
2020-05-21 01:41:27 +02:00 |
|
Frédéric FRANCE
|
416e6dd90d
|
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-21 01:11:45 +02:00 |
|
Frédéric FRANCE
|
ccadb1ec7a
|
add new rule
|
2020-05-21 00:47:16 +02:00 |
|
Laurent Destailleur
|
64ebc665c7
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-20 23:32:59 +02:00 |
|
Laurent Destailleur
|
de11fb2783
|
Fix phpcs
|
2020-05-20 23:32:13 +02:00 |
|
Laurent Destailleur
|
88c939562e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-20 12:39:01 +02:00 |
|
Laurent Destailleur
|
66df82f9e0
|
Better management of absolute url for canonical link tag
|
2020-05-20 12:38:38 +02:00 |
|
Laurent Destailleur
|
2f7786f50f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-20 10:37:43 +02:00 |
|
Laurent Destailleur
|
c5e341883d
|
Fix popup of supplier invoice
|
2020-05-19 23:22:40 +02:00 |
|
Laurent Destailleur
|
346082b153
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-19 19:59:24 +02:00 |
|
Laurent Destailleur
|
00d7947ee8
|
Fix link replaced twice
|
2020-05-19 19:55:28 +02:00 |
|
Laurent Destailleur
|
d89c9abcb6
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-19 00:53:01 +02:00 |
|
Laurent Destailleur
|
7b29ce036a
|
Fix input of virtual host and canonical url
|
2020-05-19 00:50:30 +02:00 |
|
Laurent Destailleur
|
9f9dfb94f0
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-18 22:40:52 +02:00 |
|
Laurent Destailleur
|
76663ae3e8
|
Fix canonical tag
|
2020-05-18 22:40:32 +02:00 |
|
Laurent Destailleur
|
d60598b848
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-18 14:53:57 +02:00 |
|
Laurent Destailleur
|
d3ac33ce20
|
Fix json-ld file
|
2020-05-18 14:53:35 +02:00 |
|
Laurent Destailleur
|
729cc4fd6f
|
Fix do not show full path
|
2020-05-18 13:26:33 +02:00 |
|
Laurent Destailleur
|
02d4ecb21c
|
Fix url for youtube
|
2020-05-17 20:08:01 +02:00 |
|
Laurent Destailleur
|
9370f71d01
|
Fix hardcoded value
|
2020-05-17 20:03:56 +02:00 |
|
Laurent Destailleur
|
bd564486ff
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-17 20:03:09 +02:00 |
|
Laurent Destailleur
|
8a6ae84fb0
|
Fix getStructuredData for organization
|
2020-05-17 20:02:01 +02:00 |
|
Laurent Destailleur
|
6be60efaba
|
Fix bad link in json-ld
|
2020-05-17 19:09:22 +02:00 |
|
Laurent Destailleur
|
af46108cc4
|
Look and feel v12
|
2020-05-17 13:34:16 +02:00 |
|
Laurent Destailleur
|
70fc74008a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
|
2020-05-15 17:19:43 +02:00 |
|
Laurent Destailleur
|
9fb1766266
|
CSS
|
2020-05-15 17:14:28 +02:00 |
|
Laurent Destailleur
|
5fe9c45fb2
|
Fix look and feel v12
|
2020-05-15 16:07:39 +02:00 |
|
Laurent Destailleur
|
5933aba38c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-15 14:12:04 +02:00 |
|
Laurent Destailleur
|
0f403ba9ea
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-15 14:11:13 +02:00 |
|
Scrutinizer Auto-Fixer
|
9699ee7263
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-15 11:55:31 +00:00 |
|
Laurent Destailleur
|
ad906fc508
|
Fix use SVG logo instead of PNG
|
2020-05-15 12:43:48 +02:00 |
|
Laurent Destailleur
|
40d30f9a60
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-14 18:37:47 +02:00 |
|
Laurent Destailleur
|
1bf677f537
|
Can set status of a websitepage
|
2020-05-14 18:14:55 +02:00 |
|
Laurent Destailleur
|
499c2ea30a
|
FIX #13855
|
2020-05-14 16:52:21 +02:00 |
|
Laurent Destailleur
|
3d26351c6b
|
Fix function if hours.
|
2020-05-14 16:03:31 +02:00 |
|
Laurent Destailleur
|
ae0e6e4dc8
|
FIX dol_concatdesc to escape <
Better help
|
2020-05-14 14:30:36 +02:00 |
|
Laurent Destailleur
|
4584fa1aa6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
|
2020-05-11 19:43:06 +02:00 |
|
Laurent Destailleur
|
44d36815bd
|
Look and feel v12
|
2020-05-11 19:00:27 +02:00 |
|
Laurent Destailleur
|
a2bc46f1c0
|
CSS
|
2020-05-11 12:50:24 +02:00 |
|
Laurent Destailleur
|
a8dcd2d09b
|
Clean code
|
2020-05-11 11:53:13 +02:00 |
|
Laurent Destailleur
|
c511af69fe
|
Debug look and feel v12
|
2020-05-10 21:07:49 +02:00 |
|
Laurent Destailleur
|
501f1ba2c4
|
Fix look and feel v12
|
2020-05-10 15:45:07 +02:00 |
|
Laurent Destailleur
|
42ee755ea5
|
Look and feel v12
|
2020-05-08 02:52:55 +02:00 |
|
Laurent Destailleur
|
206b16410e
|
Revert the option to avoid to introduce a feature that is duplicate with
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
|
2020-05-07 22:52:32 +02:00 |
|
Laurent Destailleur
|
0cd05887ce
|
FIX count of open day when date and start are not open should be 0
|
2020-05-07 17:21:27 +02:00 |
|
Frédéric FRANCE
|
c28e6630bb
|
Update functions.lib.php
|
2020-05-07 15:41:21 +02:00 |
|
Frédéric FRANCE
|
dd1d29f983
|
add some substitutions for date datetime
|
2020-05-07 15:37:32 +02:00 |
|
Laurent Destailleur
|
b09f179a16
|
NEW Website logs are now into a separated log file.
|
2020-05-06 04:32:48 +02:00 |
|
Laurent Destailleur
|
30fede216c
|
Fix Add '_pw' var as var sensibles.
|
2020-05-06 04:03:07 +02:00 |
|
Laurent Destailleur
|
247acdd274
|
Fix position of custom groups of modules
|
2020-05-06 03:47:28 +02:00 |
|
Laurent Destailleur
|
eacb1b3b2e
|
Debug modulebuilder
|
2020-05-05 21:45:10 +02:00 |
|
Laurent Destailleur
|
e354e71425
|
Fix link to themes on dolistore
|
2020-05-05 18:19:48 +02:00 |
|
Laurent Destailleur
|
49f9e88cc1
|
Look and feel v12
|
2020-05-05 18:16:30 +02:00 |
|
Laurent Destailleur
|
ded0526ca1
|
Merge pull request #13738 from bb2a/patch-6
links color for table title line is equal to Text color for table title line
|
2020-05-05 18:12:07 +02:00 |
|
Laurent Destailleur
|
b2a9791dca
|
Fix pagination on pages "Related items"
|
2020-05-05 16:33:02 +02:00 |
|
Laurent Destailleur
|
5e4ef9266e
|
Fix update template to use for notifications
|
2020-05-04 20:30:02 +02:00 |
|
Laurent Destailleur
|
f0f6d6e314
|
Merge pull request #13793 from andreubisquerra/master
NEW tab for Bar Restaurant parameters and new AUTO ORDER
|
2020-05-03 21:45:08 +02:00 |
|
Laurent Destailleur
|
da91a857a5
|
Fix pb of lang subdir in cloning website
|
2020-05-03 14:49:06 +02:00 |
|
stickler-ci
|
5c1eb08b3f
|
Fixing style errors.
|
2020-05-03 08:42:45 +00:00 |
|
Anthony Berton
|
87d86f32ee
|
Update usergroups.lib.php
|
2020-05-03 10:40:52 +02:00 |
|
andreubisquerra
|
fe98e430ce
|
Fix travis
|
2020-05-03 00:10:12 +02:00 |
|
jove@bisquerra.com
|
81c808692e
|
NEW Bar Restaurant tab and Auto order
|
2020-05-02 22:00:04 +02:00 |
|
Scrutinizer Auto-Fixer
|
8f0e00b4aa
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-05-02 01:39:56 +00:00 |
|
Laurent Destailleur
|
62a2469c71
|
Fix position of modules
|
2020-05-02 00:41:27 +02:00 |
|
Laurent Destailleur
|
75dd5f268f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/core/lib/sendings.lib.php
|
2020-05-01 22:00:00 +02:00 |
|
Laurent Destailleur
|
160009630f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/tools/dolibarr_export.php
|
2020-05-01 21:57:28 +02:00 |
|
Laurent Destailleur
|
b41b22996f
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
|
2020-05-01 21:03:16 +02:00 |
|
Laurent Destailleur
|
5948d385a3
|
Look and feel v12
|
2020-04-30 14:46:49 +02:00 |
|
Laurent Destailleur
|
82ace4b4ef
|
FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
|
2020-04-30 11:52:30 +02:00 |
|
Laurent Destailleur
|
478bd60ad2
|
Merge pull request #13760 from ptibogxiv/patch-336
FIX files download by API/entity
|
2020-04-28 18:01:42 +02:00 |
|
Laurent Destailleur
|
aa9ee060d5
|
Look and feel v12
|
2020-04-28 17:34:11 +02:00 |
|
kkhelifa-opendsi
|
908c653743
|
Merge branch 'develop' into stcommcontact
|
2020-04-28 09:03:17 +02:00 |
|
ptibogxiv
|
9764c85ee3
|
FIX files download by API/entity
TODO need more clean of this file with multicompany
|
2020-04-27 19:15:17 +02:00 |
|
Laurent Destailleur
|
a8613661fc
|
Fix sql
|
2020-04-27 19:03:04 +02:00 |
|
Laurent Destailleur
|
12e090eed6
|
Fix search in correct language
|
2020-04-27 18:48:35 +02:00 |
|
kamel
|
28d330996c
|
Correction pour validation Stickler CI / stickler-ci
|
2020-04-27 18:01:07 +02:00 |
|
kamel
|
9cb90cb384
|
NEW: Add prospect status managment for the contact with managment of custom icon
|
2020-04-27 17:35:14 +02:00 |
|
Laurent Destailleur
|
1c70e49695
|
Merge branch 'develop' into 12.0_a23
|
2020-04-27 14:14:13 +02:00 |
|
Laurent Destailleur
|
31157931a9
|
Fix phpcs
|
2020-04-26 23:52:23 +02:00 |
|
Laurent Destailleur
|
b20d85b198
|
Fix phpcs
|
2020-04-26 23:06:52 +02:00 |
|
Laurent Destailleur
|
3090eb578b
|
Look and feel v12
|
2020-04-25 17:43:12 +02:00 |
|
Scrutinizer Auto-Fixer
|
1bf5745286
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-25 11:52:07 +00:00 |
|
Laurent Destailleur
|
1121d2c1c6
|
Look and feel v12
|
2020-04-25 13:49:44 +02:00 |
|
Laurent Destailleur
|
5ce3174181
|
Look and feel v12
|
2020-04-25 03:31:47 +02:00 |
|
Laurent Destailleur
|
6b114a31ce
|
Look and feel v12
|
2020-04-25 03:00:41 +02:00 |
|
Laurent Destailleur
|
291664d109
|
Look and feel v12
|
2020-04-25 01:04:26 +02:00 |
|
Laurent Destailleur
|
3ed11f374a
|
Look and feel v12
|
2020-04-24 23:56:57 +02:00 |
|
Frédéric FRANCE
|
1aafd4667b
|
fix countable php7 warning
|
2020-04-24 11:57:23 +02:00 |
|
Scrutinizer Auto-Fixer
|
548f3007cf
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-23 16:55:10 +00:00 |
|
Laurent Destailleur
|
39c454d07b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modFournisseur.class.php
|
2020-04-22 18:28:52 +02:00 |
|
Laurent Destailleur
|
7bc8a70b0a
|
FIX #13670
|
2020-04-22 18:23:48 +02:00 |
|
Laurent Destailleur
|
496d8f354f
|
Look and feel v12
|
2020-04-22 17:59:54 +02:00 |
|
Laurent Destailleur
|
9a5986e190
|
css
|
2020-04-22 12:40:11 +02:00 |
|
Laurent Destailleur
|
f52408cec1
|
Look and feel v12
|
2020-04-22 00:55:38 +02:00 |
|
Laurent Destailleur
|
5c573e197b
|
Look and feel v12
|
2020-04-22 00:50:04 +02:00 |
|
Laurent Destailleur
|
cadb52c5b3
|
Look and feel v12
|
2020-04-20 19:39:34 +02:00 |
|
Laurent Destailleur
|
230fe26b58
|
Look and feel v12
|
2020-04-20 18:38:25 +02:00 |
|
Laurent Destailleur
|
acc7c371cb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/vcard.php
htdocs/core/boxes/box_birthdays.php
htdocs/core/boxes/box_birthdays_members.php
htdocs/core/lib/date.lib.php
|
2020-04-20 16:10:19 +02:00 |
|
Laurent Destailleur
|
67a7d6b77d
|
Look and feel v12
|
2020-04-20 15:57:15 +02:00 |
|
Laurent Destailleur
|
fe674f08d9
|
Fix option WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER
|
2020-04-20 03:00:10 +02:00 |
|
Laurent Destailleur
|
8d59ce2e03
|
Look and feel v12
|
2020-04-20 02:48:05 +02:00 |
|
Laurent Destailleur
|
fa056e59df
|
Look and feel v12
|
2020-04-20 02:14:43 +02:00 |
|
Maxime Kohlhaas
|
817e16d652
|
Fix birthdays boxes and filter on month
|
2020-04-18 20:01:18 +02:00 |
|
Laurent Destailleur
|
965bdf733d
|
FIX Can overwrite file if exists in file manager
|
2020-04-17 13:10:18 +02:00 |
|
Laurent Destailleur
|
15e3601336
|
Fix str_replace
|
2020-04-17 00:49:22 +02:00 |
|
Laurent Destailleur
|
d4c18c79fb
|
Add option WEBSITE_ADD_CSS_TO_BODY to add a CSS on body tag
|
2020-04-17 00:42:01 +02:00 |
|
Laurent Destailleur
|
5254a94038
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ldap.php
htdocs/commande/class/commande.class.php
htdocs/commande/index.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/expedition/list.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/list.php
htdocs/loan/list.php
htdocs/product/class/product.class.php
htdocs/supplier_proposal/list.php
|
2020-04-16 15:58:59 +02:00 |
|
Scrutinizer Auto-Fixer
|
d021559b16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-15 22:42:57 +00:00 |
|
Laurent Destailleur
|
86eaa78f1e
|
FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
DOL_DOCUMENT_DIR.
|
2020-04-15 20:00:27 +02:00 |
|
Laurent Destailleur
|
0d97d88da0
|
Increase size of small image
|
2020-04-15 18:12:34 +02:00 |
|
Laurent Destailleur
|
6e9cbe5b70
|
Fix RSS for blogs
|
2020-04-15 03:32:49 +02:00 |
|
Laurent Destailleur
|
5772057723
|
Page to import template easier to understand.
|
2020-04-13 22:52:34 +02:00 |
|
Laurent Destailleur
|
0878ee3a0f
|
Look and feel v12
|
2020-04-13 17:55:25 +02:00 |
|
Laurent Destailleur
|
3740d59848
|
Look and feel v12
|
2020-04-13 04:14:28 +02:00 |
|
Laurent Destailleur
|
47b034079a
|
Look and feel v12
|
2020-04-13 03:14:01 +02:00 |
|
Laurent Destailleur
|
d0dbf323ed
|
css
|
2020-04-13 01:42:10 +02:00 |
|
Laurent Destailleur
|
549b126eff
|
Look and feel v12
|
2020-04-12 21:36:57 +02:00 |
|
Laurent Destailleur
|
ed51ce8734
|
Look and feel v12
|
2020-04-12 19:56:50 +02:00 |
|
Frédéric FRANCE
|
ea78fc48a8
|
The variable $rep seems to be never defined.
|
2020-04-12 18:03:51 +02:00 |
|
Laurent Destailleur
|
38a8cf9bc9
|
Merge pull request #13575 from frederic34/catmod
NEW Show creator, last update user of category/tag in the infoirmation tab
|
2020-04-12 17:21:04 +02:00 |
|
Laurent Destailleur
|
7d430c08d0
|
Look and feel v12
|
2020-04-12 16:36:25 +02:00 |
|
Laurent Destailleur
|
0916017519
|
Fix addreplace hook
|
2020-04-12 15:29:13 +02:00 |
|
Laurent Destailleur
|
d7784887d1
|
More font awesome picto
|
2020-04-12 14:58:50 +02:00 |
|
Frédéric FRANCE
|
b05ea6573e
|
info categorie
|
2020-04-12 00:37:05 +02:00 |
|
Laurent Destailleur
|
ca8e1f3ea5
|
NEW Can replace a string into all pages in website module
|
2020-04-11 18:18:53 +02:00 |
|
Maxime Kohlhaas
|
f5ab957faf
|
FIX #13535 : state in italian address
|
2020-04-11 17:56:23 +02:00 |
|
Laurent Destailleur
|
33a5288125
|
Add log
|
2020-04-11 16:34:59 +02:00 |
|
Laurent Destailleur
|
760121a3d1
|
Can sort list of answers.
|
2020-04-11 14:13:16 +02:00 |
|
Laurent Destailleur
|
d8e0036817
|
css
|
2020-04-11 12:41:53 +02:00 |
|
Laurent Destailleur
|
069fb27ced
|
Look and feel v12
|
2020-04-10 12:27:34 +02:00 |
|
Laurent Destailleur
|
5ff981bf61
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/user/perms.php
|
2020-04-10 12:04:21 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
5f00f0133e
|
Merge pull request #13529 from bb2a/patch-4
Display Phone link and separ personalise in const
|
2020-04-09 19:54:48 +02:00 |
|
Laurent Destailleur
|
bc2a1d653d
|
Merge pull request #13542 from ptibogxiv/patch-325
FIX pencil with font awesome 5.13
|
2020-04-09 19:35:35 +02:00 |
|
Laurent Destailleur
|
6a60678186
|
Look and feel v12
|
2020-04-09 16:36:39 +02:00 |
|
ptibogxiv
|
5bba22aeeb
|
FIX pencil with font awesome 5.13
|
2020-04-09 14:58:42 +02:00 |
|
Laurent Destailleur
|
5819aadf75
|
Clean html code (replace table into table with div)
|
2020-04-09 13:40:26 +02:00 |
|
Laurent Destailleur
|
02436c1e84
|
NEW The module selection uses a KanBan view by default.
|
2020-04-08 17:04:23 +02:00 |
|
Laurent Destailleur
|
fe614658c8
|
Look and feel v12
|
2020-04-08 16:13:29 +02:00 |
|
Anthony Berton
|
97153fd57d
|
Update functions.lib.php
|
2020-04-08 15:13:19 +02:00 |
|
Laurent Destailleur
|
18f2087cc6
|
Fix look and feel v12
|
2020-04-08 15:13:01 +02:00 |
|
Laurent Destailleur
|
1adee36314
|
Upgrade to font awesome 5.13
|
2020-04-07 21:11:18 +02:00 |
|
Laurent Destailleur
|
9d9364256b
|
More picto using fontawesome.
|
2020-04-07 16:45:08 +02:00 |
|
Laurent Destailleur
|
ff1b3db54b
|
Fix regression on hamburger picto
|
2020-04-06 23:38:30 +02:00 |
|
Laurent Destailleur
|
0933fefa1d
|
More fontawesome logo
|
2020-04-06 18:36:33 +02:00 |
|
Laurent Destailleur
|
665dc6f8d2
|
More fontawesome logo
|
2020-04-06 18:16:21 +02:00 |
|
Laurent Destailleur
|
809c741d11
|
Can use font awesome as picto of object and modules.
|
2020-04-06 15:34:28 +02:00 |
|
Laurent Destailleur
|
81f289619d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-04-05 15:47:46 +02:00 |
|
Laurent Destailleur
|
47987f239d
|
Fix trans
|
2020-04-05 15:42:39 +02:00 |
|
Laurent Destailleur
|
03b09f1d28
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-04-05 12:14:03 +02:00 |
|
Laurent Destailleur
|
13b47774e2
|
FIX #13424
|
2020-04-05 11:55:43 +02:00 |
|
Scrutinizer Auto-Fixer
|
612bac6598
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-05 00:44:59 +00:00 |
|
Laurent Destailleur
|
28a1b7af35
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-04-03 18:07:24 +02:00 |
|
Laurent Destailleur
|
a13287e285
|
Fix: validate of object is ok even if some fields are missing
|
2020-04-03 14:56:15 +02:00 |
|
Laurent Destailleur
|
99ddd25ad5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-04-02 16:51:50 +02:00 |
|
Laurent Destailleur
|
f6b216eafc
|
Fix travis
|
2020-04-01 23:32:44 +02:00 |
|
Laurent Destailleur
|
70706d9ea7
|
FIX Missing token and take into account max date when it can.
|
2020-04-01 18:48:45 +02:00 |
|
Laurent Destailleur
|
d2de6a22eb
|
WIP Can set values in extra languages
|
2020-04-01 18:11:28 +02:00 |
|
Laurent Destailleur
|
4727800206
|
Can show technical ID of any object in banner.
|
2020-04-01 16:51:45 +02:00 |
|
Laurent Destailleur
|
e75e49426f
|
Look and feel v12
|
2020-03-31 13:52:02 +02:00 |
|
Laurent Destailleur
|
416d1ce3f0
|
Fix phpcs
|
2020-03-31 00:11:31 +02:00 |
|
Laurent Destailleur
|
9fcbec9f02
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-03-30 19:36:07 +02:00 |
|
Laurent Destailleur
|
d2bfc5f6dc
|
Merge pull request #13437 from pstructures/develop
Add the ability to add tabs from module for company admin setup
|
2020-03-30 19:25:37 +02:00 |
|
Laurent Destailleur
|
06277ec6e0
|
Update company.lib.php
|
2020-03-30 19:24:00 +02:00 |
|
Laurent Destailleur
|
95de8d1992
|
Update admin.lib.php
|
2020-03-30 19:23:25 +02:00 |
|
Laurent Destailleur
|
ff549cad18
|
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields
NEW : Project task list, add column selector and extrafields
|
2020-03-30 18:53:42 +02:00 |
|
Francis Appels
|
3eda785ca5
|
Add newline end of file
|
2020-03-30 10:36:49 +02:00 |
|
Francis Appels
|
076caa11ab
|
Add token functions to improve modulebuilder compatiblity with maintained versions.
|
2020-03-30 10:28:20 +02:00 |
|
Laurent Destailleur
|
d5b107211f
|
Look and feel v12
|
2020-03-28 15:20:26 +01:00 |
|
Laurent Destailleur
|
ec83f18944
|
Move more icon definition into CSS
|
2020-03-28 13:38:25 +01:00 |
|
Matt Sidnell
|
6f07b87cde
|
Update admin.lib.php
|
2020-03-27 23:22:02 +00:00 |
|
Matt Sidnell
|
f93bdf6b22
|
Fix so company_admin tabs do not show in Societe
fix
|
2020-03-27 23:09:40 +00:00 |
|
Matt Sidnell
|
815ae3cb09
|
Ability to add new tabs on company admin section
I have added the option to add a tab from a module to the main company setup section. I need this ability so thought that others might too.
|
2020-03-27 21:51:34 +00:00 |
|
Laurent Destailleur
|
c27592bad2
|
Clean deprecated params on all fetch_optionals()
|
2020-03-27 16:02:58 +01:00 |
|
stickler-ci
|
208049a8f2
|
Fixing style errors.
|
2020-03-26 07:27:10 +00:00 |
|
florian HENRY
|
aded72a6fa
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
|
2020-03-26 08:24:39 +01:00 |
|
florian HENRY
|
21b98a7c4c
|
set as global
|
2020-03-26 08:24:20 +01:00 |
|
Laurent Destailleur
|
20fad86520
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
|
2020-03-26 00:14:06 +01:00 |
|
Laurent Destailleur
|
3855ef6073
|
Add rounding code 'CR' (currency rate'
|
2020-03-25 17:41:39 +01:00 |
|
Laurent Destailleur
|
f509c6a266
|
Add user id into ajaxconst_onoff
|
2020-03-25 16:00:42 +01:00 |
|
florian HENRY
|
81d86f717d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
|
2020-03-25 12:14:54 +01:00 |
|
Laurent Destailleur
|
92db075aa1
|
Add parameter morecss to img_credit_card()
|
2020-03-24 21:40:25 +01:00 |
|
florian HENRY
|
6e4038a051
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
|
2020-03-24 19:50:19 +01:00 |
|
florian HENRY
|
46a4184f15
|
NEW : Project task list, add column selector and extrafields
|
2020-03-24 19:50:01 +01:00 |
|
Laurent Destailleur
|
62fefab5ac
|
Standardize color of status
|
2020-03-24 19:06:37 +01:00 |
|
gauthier
|
4c0de74470
|
FIX : sort by default role makes no sense
|
2020-03-24 16:27:53 +01:00 |
|
Laurent Destailleur
|
a5379c7144
|
FIX All forms must use newToken()
Conflicts:
htdocs/commande/card.php
htdocs/compta/cashcontrol/cashcontrol_card.php
htdocs/supplier_proposal/card.php
|
2020-03-24 13:14:23 +01:00 |
|
Laurent Destailleur
|
1ff15e1fd9
|
FIX All forms must use newToken()
|
2020-03-24 13:10:35 +01:00 |
|
Laurent Destailleur
|
2b33ef7e46
|
Align color of graph of status on status color
|
2020-03-24 13:06:59 +01:00 |
|
Laurent Destailleur
|
f56de9f177
|
Fix autocalculation of timespent in monthy mode
|
2020-03-23 22:04:40 +01:00 |
|
Laurent Destailleur
|
063cf15bcb
|
Clean code
|
2020-03-23 20:16:51 +01:00 |
|
Laurent Destailleur
|
c249a1af14
|
Merge pull request #13408 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
|
2020-03-23 17:39:09 +01:00 |
|
Laurent Destailleur
|
2a310b09af
|
Fix phpcs
|
2020-03-23 17:24:47 +01:00 |
|
Laurent Destailleur
|
b18d3e5588
|
Fix var not defined
|
2020-03-23 15:58:47 +01:00 |
|
Scrutinizer Auto-Fixer
|
e8083e2a65
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-23 14:54:02 +00:00 |
|
Laurent Destailleur
|
01e60562b9
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/index.php
htdocs/takepos/takepos.php
|
2020-03-23 15:38:10 +01:00 |
|
Laurent Destailleur
|
24dc202022
|
Doc
|
2020-03-23 15:33:52 +01:00 |
|
Laurent Destailleur
|
2177afecd9
|
Sort order
|
2020-03-23 14:12:48 +01:00 |
|
Alexandre SPANGARO
|
7d22ccbd12
|
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
|
2020-03-23 05:50:07 +01:00 |
|
Laurent Destailleur
|
c80c247a84
|
Fix phpcs
|
2020-03-22 20:22:33 +01:00 |
|
Laurent Destailleur
|
3eaed6bfc8
|
Fix phpcs
|
2020-03-22 20:22:08 +01:00 |
|
Laurent Destailleur
|
6f3cbe69e8
|
Fix phpcs
|
2020-03-22 19:40:58 +01:00 |
|
Laurent Destailleur
|
b0f3fba71a
|
Fix phpcs
|
2020-03-22 18:27:56 +01:00 |
|
Laurent Destailleur
|
3d6849dfea
|
Fix label of tabs
|
2020-03-22 17:27:08 +01:00 |
|
Alexandre SPANGARO
|
c05ef16e0b
|
Work on split module fournisseur
|
2020-03-22 05:51:14 +01:00 |
|
Laurent Destailleur
|
bcf17c79ef
|
FIX closing tags
|
2020-03-22 02:44:00 +01:00 |
|
Laurent Destailleur
|
e2acb0c65e
|
code indent
|
2020-03-21 19:37:09 +01:00 |
|
Laurent Destailleur
|
792b9228d3
|
Can search in several different type of containers
|
2020-03-21 19:09:14 +01:00 |
|
Laurent Destailleur
|
83b8497d28
|
Rename sample file so we can use color editor
|
2020-03-21 17:58:03 +01:00 |
|
Laurent Destailleur
|
4ce1665a15
|
Fix charset in RSS export
|
2020-03-21 17:36:07 +01:00 |
|
Laurent Destailleur
|
79086011f8
|
Work on RSS export of blog posts
|
2020-03-21 17:31:44 +01:00 |
|
Laurent Destailleur
|
666b38b44a
|
Fix charset in RSS export
|
2020-03-21 17:31:09 +01:00 |
|
Laurent Destailleur
|
7370268b13
|
Tool to regenerate files
|
2020-03-21 11:04:33 +01:00 |
|
Laurent Destailleur
|
27015fc6f6
|
NEW Add method to add social network sharing buttons on blog posts
|
2020-03-20 19:34:49 +01:00 |
|
Laurent Destailleur
|
a2f9f72973
|
Enhance website module
|
2020-03-20 18:58:45 +01:00 |
|
Laurent Destailleur
|
f904ff5240
|
Add dol_escape_json method
|
2020-03-20 17:10:35 +01:00 |
|
Laurent Destailleur
|
aa1f601528
|
FIX Backto link
|
2020-03-20 16:30:45 +01:00 |
|
Laurent Destailleur
|
a0086d73a1
|
Merge pull request #13371 from aspangaro/12.0_a23
Work on split module fournisseur
|
2020-03-20 10:37:54 +01:00 |
|
Laurent Destailleur
|
222556b464
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
|
2020-03-19 22:09:17 +01:00 |
|
Laurent Destailleur
|
7eb4522636
|
FIX missing token and save of survey description
|
2020-03-19 11:59:57 +01:00 |
|
Alexandre SPANGARO
|
bac099dc60
|
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
|
2020-03-19 11:48:21 +01:00 |
|
Laurent Destailleur
|
8e1ffa5144
|
Fix management of token
|
2020-03-19 10:52:07 +01:00 |
|
Laurent Destailleur
|
a76392f944
|
Responsive
|
2020-03-17 21:26:25 +01:00 |
|
Alexandre SPANGARO
|
033f796398
|
Work on split module fournisseur
|
2020-03-17 14:51:48 +01:00 |
|
Laurent Destailleur
|
76fc722638
|
NEW Can get some variables (not available by default)
|
2020-03-17 13:33:21 +01:00 |
|
Laurent Destailleur
|
5f255a6c14
|
A new way to navigate between pages in list is available
|
2020-03-17 03:24:24 +01:00 |
|
Laurent Destailleur
|
aef827f826
|
Alias on same line than name
|
2020-03-14 14:47:01 +01:00 |
|
Laurent Destailleur
|
f92943bee2
|
css
|
2020-03-14 03:24:46 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Laurent Destailleur
|
52290b002a
|
NEW Another way to navigate between pages for some lists
|
2020-03-13 12:53:22 +01:00 |
|
Laurent Destailleur
|
d3447bb44b
|
Fix duplicate /
|
2020-03-13 10:14:26 +01:00 |
|
Laurent Destailleur
|
4bd1c6c717
|
Fix hreflink
|
2020-03-13 09:51:41 +01:00 |
|
Laurent Destailleur
|
967d4223c6
|
FIX #13277
|
2020-03-12 16:15:48 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
fc05e8d768
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
|
2020-03-11 18:03:15 +01:00 |
|
Laurent Destailleur
|
25eae4db9c
|
Fix missing __USER_EMAIL__ substitution
|
2020-03-11 16:28:00 +01:00 |
|
Laurent Destailleur
|
26fec2f366
|
Enhance website
|
2020-03-11 12:53:41 +01:00 |
|
Laurent Destailleur
|
99b1c773a7
|
FIX link when using anchor on "/"
|
2020-03-09 18:56:52 +01:00 |
|
Laurent Destailleur
|
e536ee87b8
|
FIX link when using anchor on "/"
|
2020-03-09 18:54:34 +01:00 |
|
Laurent Destailleur
|
fefb3fdde7
|
Fix permissions on restricArea for external modules
|
2020-03-08 18:26:41 +01:00 |
|
Laurent Destailleur
|
44a611e006
|
Move getElementProperties and fetchObjectByElement into functions
|
2020-03-07 15:06:14 +01:00 |
|
Laurent Destailleur
|
47ebc2bbf2
|
Hide legend
|
2020-03-06 09:52:51 +01:00 |
|
Laurent Destailleur
|
52c236570b
|
Work on the generic Graphic Reporting tool
|
2020-03-06 01:18:35 +01:00 |
|
Laurent Destailleur
|
a5a2d60755
|
Fix phpcs
|
2020-03-05 00:20:39 +01:00 |
|
Laurent Destailleur
|
a6d340a22c
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
|
2020-03-04 19:28:15 +01:00 |
|
Laurent Destailleur
|
deda6252f2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
|
2020-03-04 19:22:30 +01:00 |
|
atm-arnaud
|
834873ab15
|
FIX date order was -1D and desc with label repetition
|
2020-03-04 11:58:42 +01:00 |
|
Laurent Destailleur
|
537d129627
|
Merge pull request #13251 from bb2a/patch-20
NEW Add subtitution variables for url of document in backoffice
|
2020-03-03 23:13:53 +01:00 |
|
Anthony Berton
|
2fd7276a30
|
Update functions.lib.php
|
2020-03-03 09:53:00 +01:00 |
|
Laurent Destailleur
|
ea7c2aa46b
|
Update functions.lib.php
|
2020-03-02 21:47:36 +01:00 |
|
Laurent Destailleur
|
05556a77af
|
Fix css
|
2020-03-02 19:37:16 +01:00 |
|
Anthony Berton
|
d9a002a8bd
|
Update functions.lib.php
|
2020-03-02 19:27:36 +01:00 |
|
Anthony Berton
|
197f81cb52
|
Update functions.lib.php
|
2020-03-02 19:23:45 +01:00 |
|
Anthony Berton
|
12b9897f5c
|
Update functions.lib.php
|
2020-03-02 18:53:52 +01:00 |
|
Laurent Destailleur
|
db96634339
|
Fix trans
|
2020-03-02 18:50:21 +01:00 |
|
Laurent Destailleur
|
91e8df5c9b
|
Fix canonical name
|
2020-03-02 18:43:44 +01:00 |
|
Laurent Destailleur
|
390c0ce4dc
|
Fix main language is not into subdir
|
2020-03-02 18:41:30 +01:00 |
|
Laurent Destailleur
|
fab39aef9e
|
Clean menu bar
|
2020-03-02 17:35:49 +01:00 |
|
Laurent Destailleur
|
bb79c2cbd9
|
Fix links
|
2020-03-02 17:06:22 +01:00 |
|
Laurent Destailleur
|
dea1f1b19f
|
Fix link
|
2020-03-02 17:00:51 +01:00 |
|
Laurent Destailleur
|
8928a84c53
|
Fix link to medias
|
2020-03-02 16:56:54 +01:00 |
|
Laurent Destailleur
|
f2dba4f621
|
Merge pull request #13227 from aspangaro/12.0_a16
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-29 13:02:43 +01:00 |
|
Laurent Destailleur
|
8879672122
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-29 12:52:18 +01:00 |
|
Laurent Destailleur
|
0855598c00
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/lib/functions.lib.php
|
2020-02-29 12:51:33 +01:00 |
|
Laurent Destailleur
|
56704e4029
|
Add stats of products in MO
|
2020-02-28 19:26:52 +01:00 |
|
Laurent Destailleur
|
a3e56994b6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
|
2020-02-27 18:35:32 +01:00 |
|
Alexandre SPANGARO
|
86d9622360
|
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
|
2020-02-27 10:44:04 +01:00 |
|
atm-quentin
|
009eb0d4a4
|
FIX test on 0 better than isset
|
2020-02-27 09:34:20 +01:00 |
|
Laurent Destailleur
|
9bc5eb44ca
|
FIX #13182
|
2020-02-26 20:25:26 +01:00 |
|
atm-quentin
|
a5baf2bc88
|
FIX search with '0'
|
2020-02-26 09:19:39 +01:00 |
|
Laurent Destailleur
|
39624f21e7
|
Fix var not always defined
|
2020-02-25 15:36:34 +01:00 |
|
Laurent Destailleur
|
61abfb95a5
|
Look and feel v12
|
2020-02-25 13:28:11 +01:00 |
|
Laurent Destailleur
|
16b3e6f7bb
|
Move external access on dedicated tab
Translate field to sort products
|
2020-02-25 12:44:18 +01:00 |
|
Laurent Destailleur
|
ace5f2844a
|
Make Setup of TakePOS faster with Ajax ON-Off Button.
|
2020-02-25 12:37:44 +01:00 |
|
Laurent Destailleur
|
d78221ea08
|
css
|
2020-02-24 21:48:46 +01:00 |
|
Laurent Destailleur
|
7cd49f327e
|
Look and feel v12: CSS for qty in lists
|
2020-02-24 21:47:48 +01:00 |
|
Laurent Destailleur
|
68526a14cd
|
NEW Truncate columns names when too long and show full title as popup
|
2020-02-24 21:33:28 +01:00 |
|
Laurent Destailleur
|
32d74adf20
|
NEW Truncate columns names when too long and show full title as popup
|
2020-02-24 21:18:49 +01:00 |
|
Laurent Destailleur
|
9d9429f66b
|
New: Can limit number of tabs by page.
|
2020-02-24 20:41:29 +01:00 |
|
Laurent Destailleur
|
32d12468cf
|
Use SVG logo instead of png
|
2020-02-24 06:27:03 +01:00 |
|
Laurent Destailleur
|
096a568e83
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
|
2020-02-23 23:42:23 +01:00 |
|
Laurent Destailleur
|
3075e40f8c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
|
2020-02-23 23:37:46 +01:00 |
|
Laurent Destailleur
|
189c0d675b
|
Fix memory report. Xdebug no more required. Try = null instead of unset.
|
2020-02-23 22:05:59 +01:00 |
|
Laurent Destailleur
|
b4fdd9bc50
|
Merge pull request #13078 from hregis/10.0_mc
FIX #10309
|
2020-02-21 19:21:54 +01:00 |
|
Laurent Destailleur
|
e4b00c5c20
|
Merge branch 'develop' into master
|
2020-02-21 18:20:10 +01:00 |
|
Frédéric FRANCE
|
f6eba36575
|
fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
|
2020-02-21 18:00:12 +01:00 |
|
Laurent Destailleur
|
9b9f6d5da4
|
Merge pull request #13151 from frederic34/patch-6
fix CATEGORY_ADD_DESC_INTO_DOC
|
2020-02-21 17:55:19 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
Laurent Destailleur
|
7909055ee8
|
Enhance multilangue support in website module
|
2020-02-21 11:36:16 +01:00 |
|
Laurent Destailleur
|
1f4b639ba0
|
Debug MRP module
|
2020-02-20 17:44:03 +01:00 |
|
javierybar
|
2942e85e47
|
More elegant and easy to understand printer setup
|
2020-02-20 15:16:17 +01:00 |
|
Frédéric FRANCE
|
523e161f33
|
fix CATEGORY_ADD_DESC_INTO_DOC
$cate->add_category doesn't exists
|
2020-02-20 09:45:17 +01:00 |
|
Alexandre SPANGARO
|
a7ca7dfbb6
|
FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD
|
2020-02-20 06:00:17 +01:00 |
|
Laurent Destailleur
|
76f0df138b
|
Try to fix doc
|
2020-02-20 01:26:40 +01:00 |
|
Laurent Destailleur
|
895503d2eb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
|
2020-02-20 00:21:25 +01:00 |
|
Laurent Destailleur
|
0c571c0376
|
Restore common behaviour: Draft object are on left under graph.
Open and live objects are on right
|
2020-02-19 14:20:55 +01:00 |
|
Laurent Destailleur
|
1dd5ba093d
|
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
|
2020-02-19 12:11:16 +01:00 |
|
Laurent Destailleur
|
ac16857501
|
GETPOST(..., 'alpha') remove " if found instead of returning ''
|
2020-02-19 11:33:45 +01:00 |
|
Laurent Destailleur
|
7c07589850
|
FIX #13124
|
2020-02-19 03:07:12 +01:00 |
|
Laurent Destailleur
|
9883c0b688
|
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount
NEW add weighted amount on project/opportunity
|
2020-02-19 00:03:03 +01:00 |
|
Laurent Destailleur
|
b618581692
|
More ajax button in setup. Can reload after on ajaxonoff.
|
2020-02-18 09:38:34 +01:00 |
|
Laurent Destailleur
|
6555f5d74f
|
More default hmtl tags in restricthtmlonly
|
2020-02-17 20:55:17 +01:00 |
|
Laurent Destailleur
|
a6b0fec90b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/exports/class/export.class.php
|
2020-02-17 12:35:34 +01:00 |
|
Laurent Destailleur
|
bf281b7dab
|
Comment
|
2020-02-17 11:51:49 +01:00 |
|
Laurent Destailleur
|
f4f3efec62
|
Fight against $_POST
|
2020-02-16 19:33:58 +01:00 |
|
Regis Houssin
|
0ab0bb2e7d
|
FIX wrong test
|
2020-02-14 19:26:28 +01:00 |
|
Scrutinizer Auto-Fixer
|
17010478ba
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-13 09:44:08 +00:00 |
|
Regis Houssin
|
52506ddd05
|
FIX can be a string or integer
|
2020-02-13 09:25:36 +01:00 |
|
Regis Houssin
|
f19f706c38
|
FIX better check
|
2020-02-13 07:55:52 +01:00 |
|
Laurent Destailleur
|
7931734ecb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modUser.class.php
|
2020-02-12 20:30:20 +01:00 |
|
Laurent Destailleur
|
3a9125b097
|
Merge pull request #13087 from ptibogxiv/patch-304
Fix netmeasure update and display
|
2020-02-12 18:35:44 +01:00 |
|
Laurent Destailleur
|
bd0666bf53
|
Update product.lib.php
|
2020-02-12 18:35:15 +01:00 |
|
Laurent Destailleur
|
e74df397eb
|
FIX #13094
|
2020-02-12 17:28:18 +01:00 |
|
ptibogxiv
|
f17c7f4cb3
|
fix for unit with rowid (netmeasure)
|
2020-02-11 20:21:53 +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
|
05f0242198
|
NEW The info_admin() can show text after click on other text
|
2020-02-11 10:38:09 +01:00 |
|
Regis Houssin
|
275b5d1f77
|
FIX #10309
|
2020-02-11 07:32:29 +01:00 |
|
Laurent Destailleur
|
8645fd8946
|
FIX CVE-2019–17223 FIX #13053
|
2020-02-09 18:28:57 +01:00 |
|
Laurent Destailleur
|
3852ba0655
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-08 17:16:25 +01:00 |
|
Laurent Destailleur
|
aed3ea25cb
|
Code comment
|
2020-02-08 17:14:04 +01:00 |
|
Laurent Destailleur
|
3dfe7161cf
|
Merge pull request #13035 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
|
2020-02-08 17:09:25 +01:00 |
|
Laurent Destailleur
|
716f765ce1
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
|
2020-02-08 16:00:06 +01:00 |
|
Laurent Destailleur
|
df7cdd1da8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/admin/tools/export_files.php
htdocs/comm/mailing/class/advtargetemailing.class.php
htdocs/core/tpl/advtarget.tpl.php
|
2020-02-08 15:42:35 +01:00 |
|
Laurent Destailleur
|
c3beb854a2
|
Definition of $fields for member and subscriptions
|
2020-02-08 13:44:31 +01:00 |
|
Laurent Destailleur
|
54414f7bb0
|
WIP Generic report
|
2020-02-07 11:53:09 +01:00 |
|
VESSILLER
|
0be98a4b1b
|
NEW add opportunity status in project stats
|
2020-02-07 09:06:07 +01:00 |
|
Laurent Destailleur
|
fe0d1a81eb
|
Fix filter on current user is stupi on the view "per user".
|
2020-02-06 21:16:48 +01:00 |
|
Laurent Destailleur
|
5e71366ff2
|
css
|
2020-02-06 18:06:36 +01:00 |
|
Laurent Destailleur
|
05e08b3596
|
FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
|
2020-02-06 12:58:02 +01:00 |
|
Scrutinizer Auto-Fixer
|
59c0631172
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-06 09:49:12 +00:00 |
|
Laurent Destailleur
|
4f3cc87077
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:38 +01:00 |
|
Laurent Destailleur
|
30fa8940a9
|
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
|
2020-02-05 19:23:00 +01:00 |
|
Laurent Destailleur
|
80f4e625be
|
Fix phpcs
|
2020-02-05 17:07:42 +01:00 |
|
Laurent Destailleur
|
1875b6a49b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
|
2020-02-05 14:53:47 +01:00 |
|
Laurent Destailleur
|
c015707cbc
|
Fix Only dolibarr logos are in root of theme
|
2020-02-05 14:14:59 +01:00 |
|
Laurent Destailleur
|
ddd1ca26b9
|
CSS
|
2020-02-05 14:04:19 +01:00 |
|
Laurent Destailleur
|
f8daed7f56
|
Update company.lib.php
|
2020-02-05 12:49:56 +01:00 |
|
ptibogxiv
|
94fd2b40c7
|
new fix Count of Stripe payment mode must take test/live into account
fix error message for if no stripe enabled 0b891d5e0c
|
2020-02-05 12:04:27 +01:00 |
|
Laurent Destailleur
|
0b891d5e0c
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:47 +01:00 |
|
Laurent Destailleur
|
bc19f72306
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:20 +01:00 |
|
Laurent Destailleur
|
bb1c9a66dd
|
Fix code alignement on modulebuilder
|
2020-02-04 16:37:30 +01:00 |
|
Laurent Destailleur
|
976ce0a954
|
Fix scrutinizer
|
2020-02-04 14:33:25 +01:00 |
|
Laurent Destailleur
|
157745a1bb
|
Fix phpcs
|
2020-02-04 14:18:37 +01:00 |
|
Alexandre SPANGARO
|
d6d3fff9dc
|
Merge branch 'develop' into 10.0_intracommreport
|
2020-02-03 21:15:07 +01:00 |
|
Laurent Destailleur
|
12b63606df
|
Fix look and feel of v11
|
2020-02-02 20:21:16 +01:00 |
|
Laurent Destailleur
|
21e4717721
|
Merge pull request #12983 from atm-quentin/NEW_monthly_view
NEW monthly view to enter time
|
2020-02-02 20:05:18 +01:00 |
|
Laurent Destailleur
|
86c1777702
|
Merge pull request #12976 from mapiolca/patch-28
Add support of Number2Words module (v2)
|
2020-02-02 19:54:49 +01:00 |
|
Laurent Destailleur
|
ffa847bc8e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-02 19:32:37 +01:00 |
|
Laurent Destailleur
|
075b1ea744
|
FIX Log of authentication ko or ko + CVE-2020-7996
|
2020-02-02 19:05:38 +01:00 |
|
Laurent Destailleur
|
aa54aaeb01
|
FIX search filter on extrafields were not restored avec "Back to list"
|
2020-01-31 19:46:03 +01:00 |
|
Laurent Destailleur
|
9372940f17
|
Fix log through proxy
|
2020-01-31 17:51:30 +01:00 |
|
Laurent Destailleur
|
8e18a08377
|
Fix log of proxy forward only if it differs from remote_addr
|
2020-01-31 16:59:10 +01:00 |
|
Laurent Destailleur
|
0cd8337b7e
|
NEW Can manage situation invoices
|
2020-01-31 14:54:42 +01:00 |
|
Laurent Destailleur
|
f752551914
|
WIP Generic stats page
|
2020-01-31 14:53:47 +01:00 |
|
atm-quentin
|
78baae1480
|
Fix stickler v2
|
2020-01-31 11:51:40 +01:00 |
|
atm-quentin
|
398e83d1cc
|
FIX for stickler
|
2020-01-31 11:36:53 +01:00 |
|
stickler-ci
|
fee113bfb5
|
Fixing style errors.
|
2020-01-31 10:26:33 +00:00 |
|
atm-quentin
|
a001913751
|
Debut modification saisie par mois
NEW hook and data id
NEW visu FROM day TO day in permonth view
FIX
|
2020-01-31 11:21:49 +01:00 |
|
atm-quentin
|
ae14814f10
|
NEW visu FROM day TO day in permonth view
|
2020-01-31 11:10:40 +01:00 |
|
Laurent Destailleur
|
c58f76b15c
|
Fix constant name
|
2020-01-30 17:06:26 +01:00 |
|
Pierre Ardoin
|
05d3c134db
|
Add support of Number2Words module (v2)
if the Number2Words Module is detected, this conversion is selected.
|
2020-01-30 15:58:21 +01:00 |
|
Laurent Destailleur
|
141664ff10
|
Fix phpcs
|
2020-01-30 02:25:26 +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
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
f64ad71924
|
Missing country code
|
2020-01-28 02:50:11 +01:00 |
|
Laurent Destailleur
|
c2c80bf40f
|
Fix Look and feel v11
|
2020-01-28 02:44:41 +01:00 |
|
Laurent Destailleur
|
fc63d7366d
|
FIX Mandatory fields must stay mandatory if create/update submit fails
|
2020-01-27 22:23:40 +01:00 |
|
Laurent Destailleur
|
4fe942985f
|
FIX Mandatory fields must stay mandatory if create/update submit fails
|
2020-01-27 22:22:59 +01:00 |
|
Laurent Destailleur
|
29853b5fbd
|
Fix responsive for public interface of tickets
|
2020-01-27 14:01:35 +01:00 |
|
Laurent Destailleur
|
50d9ac0b52
|
Fix else if
|
2020-01-27 02:13:12 +01:00 |
|
Laurent Destailleur
|
08d8670bb3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/class/product.class.php
|
2020-01-24 20:12:27 +01:00 |
|
Laurent Destailleur
|
8f3f34e1c0
|
Fix css
|
2020-01-24 20:11:07 +01:00 |
|
Laurent Destailleur
|
de4183ea65
|
Update logos
|
2020-01-24 17:30:46 +01:00 |
|
Laurent Destailleur
|
27a0858050
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-23 17:41:31 +01:00 |
|
Laurent Destailleur
|
7ad827f212
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2020-01-23 12:09:01 +01:00 |
|
Laurent Destailleur
|
be344518c4
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/lib/functions2.lib.php
|
2020-01-23 12:07:17 +01:00 |
|
Laurent Destailleur
|
cbe396b97c
|
Update functions2.lib.php
|
2020-01-23 12:04:14 +01:00 |
|
Laurent Destailleur
|
1487158082
|
Update functions2.lib.php
|
2020-01-23 12:02:29 +01:00 |
|
Alexandre SPANGARO
|
7f47b48559
|
Move function to functions2.lib.php
|
2020-01-23 11:47:30 +01:00 |
|
Alexandre SPANGARO
|
5eeef771fa
|
FIX: FEC export format
|
2020-01-23 06:20:31 +01:00 |
|
Laurent Destailleur
|
040f8bef5a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/societe/class/societe.class.php
|
2020-01-22 16:29:04 +01:00 |
|
Laurent Destailleur
|
28d0b85b84
|
Fix phpcs
|
2020-01-22 14:56:19 +01:00 |
|
Laurent Destailleur
|
2caa4e9fa6
|
Merge pull request #12885 from leninrivas/10.0
FIX Missing Linked objects Fichinter Ref. in PDF formats
|
2020-01-22 14:17:25 +01:00 |
|
Laurent Destailleur
|
4922567a27
|
Add .noexec extension for old php4, php5... files
|
2020-01-21 15:02:04 +01:00 |
|
Laurent Destailleur
|
4fdfba3867
|
Add .noexec extension for old php4, php5... files
|
2020-01-21 15:01:22 +01:00 |
|
Laurent Destailleur
|
ab5940f28c
|
Fix css lost
|
2020-01-21 00:56:32 +01:00 |
|
Laurent Destailleur
|
acdb28ba25
|
Add country id and country code in substitution vars
|
2020-01-21 00:28:53 +01:00 |
|
Laurent Destailleur
|
5b86851cf3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:46:52 +01:00 |
|
Laurent Destailleur
|
5cac54b2e1
|
Doc
|
2020-01-20 18:46:13 +01:00 |
|
Laurent Destailleur
|
92856788a3
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-20 18:39:46 +01:00 |
|
Laurent Destailleur
|
d465101ae3
|
Fix We should not be able to choose which permission to use to have
access to an object.
|
2020-01-20 14:29:02 +01:00 |
|
Laurent Destailleur
|
18f2b09fb1
|
Debug v11
|
2020-01-20 12:25:25 +01:00 |
|
Laurent Destailleur
|
b8938b8d19
|
Fix look and feel v11
|
2020-01-20 02:18:00 +01:00 |
|
Laurent Destailleur
|
24d439845b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
|
2020-01-18 20:20:25 +01:00 |
|
Laurent Destailleur
|
d9f7c4aec4
|
FIX #12838
|
2020-01-18 19:53:48 +01:00 |
|
Laurent Destailleur
|
9c1e409feb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-17 11:35:16 +01:00 |
|
Laurent Destailleur
|
c556f60c89
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-16 18:13:35 +01:00 |
|
Anthony Berton
|
9a6ee89d43
|
Update functions.lib.php
|
2020-01-16 15:44:07 +01:00 |
|
Anthony Berton
|
9a6bcaa683
|
Update functions.lib.php
|
2020-01-16 15:20:09 +01:00 |
|
Laurent Destailleur
|
849c78f4cd
|
Doc
|
2020-01-16 10:12:39 +01:00 |
|
atm-ph
|
3cdb84b192
|
Fix note started with <s> balise
|
2020-01-16 09:50:57 +01:00 |
|
Laurent Destailleur
|
5772dce460
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2020-01-15 12:09:21 +01:00 |
|
Laurent Destailleur
|
07b12e507f
|
Merge pull request #12841 from bb2a/patch-10
Addition of delivery times substitution
|
2020-01-15 12:08:07 +01:00 |
|
Laurent Destailleur
|
c8ff847480
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/modulebuilder/index.php
|
2020-01-15 11:56:46 +01:00 |
|
Laurent Destailleur
|
0442105bd4
|
Fix Generation of zip of module
|
2020-01-15 11:55:27 +01:00 |
|
Anthony Berton
|
ef5c1e6c8c
|
Update functions.lib.php
|
2020-01-13 23:09:08 +00:00 |
|
Anthony Berton
|
1eff733e1c
|
Update functions.lib.php
|
2020-01-13 18:23:50 +01:00 |
|
Anthony Berton
|
f3046589e7
|
Update functions.lib.php
|
2020-01-13 18:19:51 +01:00 |
|
Anthony Berton
|
226dbceac0
|
Update functions.lib.php
|
2020-01-13 17:11:50 +01:00 |
|
Laurent Destailleur
|
9d4e1a3941
|
FIX #12797
|
2020-01-13 14:25:48 +01:00 |
|
Laurent Destailleur
|
e88c11c417
|
Space
|
2020-01-13 13:20:58 +01:00 |
|
Laurent Destailleur
|
22d4f37e58
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2020-01-10 14:31:37 +01:00 |
|
Laurent Destailleur
|
b47db086cb
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
|
2020-01-10 14:30:42 +01:00 |
|
Laurent Destailleur
|
9ebdd82edb
|
Fix We must refuse to delete a various payment if payment was dispatched
in accountancy.
|
2020-01-10 02:43:24 +01:00 |
|
Scrutinizer Auto-Fixer
|
8691194627
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-09 23:03:10 +00:00 |
|
Laurent Destailleur
|
f48c7d2ecf
|
Fix modulebuilder
|
2020-01-09 22:31:23 +01:00 |
|
Laurent Destailleur
|
0e58edd896
|
Fix modulebuilder
|
2020-01-09 22:27:24 +01:00 |
|
Laurent Destailleur
|
97f62c68f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-08 13:38:03 +01:00 |
|
Laurent Destailleur
|
622dc7e8d7
|
Debug v11
|
2020-01-07 22:01:55 +01:00 |
|
Laurent Destailleur
|
7ef3ee56bd
|
Fix MRP
|
2020-01-07 20:28:21 +01:00 |
|
Laurent Destailleur
|
a947215ac1
|
Fix morecss param was lost
|
2020-01-07 14:40:59 +01:00 |
|
Laurent Destailleur
|
0e2edde6d3
|
Look and feel v11
|
2020-01-07 14:25:58 +01:00 |
|
Laurent Destailleur
|
f4d7958ead
|
Fix duplicate record in list of events for projects
|
2020-01-07 14:16:13 +01:00 |
|
Laurent Destailleur
|
f05873201c
|
Fix duplicate record in list of events for projects
|
2020-01-07 14:14:47 +01:00 |
|
Laurent Destailleur
|
444e2f1130
|
Fix length of column
|
2020-01-07 14:01:45 +01:00 |
|
Laurent Destailleur
|
eea8a4df7b
|
Fix length of column
|
2020-01-07 14:01:12 +01:00 |
|
Laurent Destailleur
|
750fa83e96
|
FIX Bad management of elementtype not llx_actioncomm
|
2020-01-07 13:49:52 +01:00 |
|
Laurent Destailleur
|
6029e82e90
|
FIX Bad management of elementtype not llx_actioncomm
|
2020-01-07 13:48:44 +01:00 |
|
Laurent Destailleur
|
8c67ea14a0
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-06 15:30:22 +01:00 |
|
Laurent Destailleur
|
40ba90d170
|
css
|
2020-01-06 15:29:18 +01:00 |
|
Laurent Destailleur
|
afd32135f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/invoice.php
|
2020-01-01 22:37:13 +01:00 |
|
Laurent Destailleur
|
e7ac01e1bd
|
FIX localtax info were not returned correctly when call done with id.
|
2020-01-01 22:27:47 +01:00 |
|
Laurent Destailleur
|
2e8fd25299
|
FIX Local taxes was not correctly supported in TakePOS.
|
2020-01-01 21:54:47 +01:00 |
|
Alexandre SPANGARO
|
c664a1e42d
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2019-12-31 08:34:37 +01:00 |
|
Laurent Destailleur
|
094b37d79d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-23 19:12:32 +01:00 |
|
Laurent Destailleur
|
8e78dbad69
|
Fix for php 7.4
|
2019-12-23 16:41:22 +01:00 |
|
Laurent Destailleur
|
f193d3edd8
|
Fix for php7.4
|
2019-12-23 16:38:37 +01:00 |
|
Laurent Destailleur
|
1ebf7e642f
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-23 15:49:25 +01:00 |
|
Laurent Destailleur
|
330cca994e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2019-12-23 15:49:00 +01:00 |
|
Laurent Destailleur
|
3250b13f4a
|
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
|
2019-12-23 15:45:08 +01:00 |
|
Laurent Destailleur
|
07c1a5717e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
|
2019-12-23 14:16:34 +01:00 |
|
Laurent Destailleur
|
2df9df2db0
|
Debug v11
|
2019-12-23 12:24:27 +01:00 |
|
Laurent Destailleur
|
693551069b
|
Fix look and feel v11
|
2019-12-22 21:32:35 +01:00 |
|
Laurent Destailleur
|
30b8affdb7
|
Fix look and feel v11
|
2019-12-22 21:32:19 +01:00 |
|
Laurent Destailleur
|
ad039ff968
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/repair.php
|
2019-12-21 14:03:45 +01:00 |
|
Laurent Destailleur
|
03649ea2c8
|
Fix pb with svg images
|
2019-12-19 19:10:23 +01:00 |
|
Laurent Destailleur
|
43ff015157
|
Fix pb with svg images
|
2019-12-19 19:09:56 +01:00 |
|
stickler-ci
|
863fa7360d
|
Fixing style errors.
|
2019-12-19 09:57:37 +00:00 |
|
Laurent Destailleur
|
dd0a1b3e10
|
Merge branch 'develop' into develop_project
|
2019-12-19 10:56:03 +01:00 |
|
Laurent Destailleur
|
2afaed6981
|
Fix bad use of MAIN_MAX_DECIMALS_UNIT_ for foreign currencies
|
2019-12-19 10:50:23 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
138215fc3f
|
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
european users.
|
2019-12-16 22:30:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Laurent Destailleur
|
fdf4d86d81
|
Debug code
|
2019-12-16 12:38:51 +01:00 |
|
Laurent Destailleur
|
28bcb49957
|
Fix css
|
2019-12-16 11:32:27 +01:00 |
|
Laurent Destailleur
|
9e94be8bac
|
CSS
|
2019-12-15 20:31:09 +01:00 |
|
Laurent Destailleur
|
7c71f6cae9
|
Fix message
|
2019-12-15 17:48:30 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Laurent Destailleur
|
17b9964678
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
|
2019-12-14 14:43:14 +01:00 |
|
Laurent Destailleur
|
a8de7b850a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/admin/system/filecheck.php
|
2019-12-14 14:33:46 +01:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Laurent Destailleur
|
d38c73c90a
|
FIX output of emails from and error on emailing pages.
|
2019-12-13 15:52:08 +01:00 |
|
Laurent Destailleur
|
a612aefab7
|
Fix HTML5
|
2019-12-12 11:11:08 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Frédéric FRANCE
|
12f84d8254
|
doxygen
|
2019-12-11 23:04:27 +01:00 |
|
Laurent Destailleur
|
6f4e2e7e61
|
Fix rounding with multicurrency
|
2019-12-11 17:58:14 +01:00 |
|
VESSILLER
|
0396b348f7
|
NEW add weighted amount on project/opportunity
|
2019-12-10 09:32:37 +01:00 |
|
Frédéric FRANCE
|
f4674a7558
|
doxygen and $db bot defined
|
2019-12-10 07:51:39 +01:00 |
|
Laurent Destailleur
|
c8f457f303
|
Merge pull request #12666 from atm-john/develop_fix_exif_read_data_fatal
Fix warning introduce by my #12605 PR #12622
|
2019-12-09 15:57:24 +01:00 |
|
Laurent Destailleur
|
04a7de14c6
|
Merge pull request #12660 from Ahuahuachi/develop
Bugfix: Module builder missing table prefix
|
2019-12-09 15:56:01 +01:00 |
|
Laurent Destailleur
|
8c50097012
|
Update modulebuilder.lib.php
|
2019-12-09 15:55:25 +01:00 |
|
Laurent Destailleur
|
a12b2fea80
|
Update modulebuilder.lib.php
|
2019-12-09 15:54:14 +01:00 |
|
John Botella
|
e1cf93d9a9
|
Fix exif_read_data fatal error
|
2019-12-09 14:44:37 +01:00 |
|
Laurent Destailleur
|
63a26ed436
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-12-09 13:25:49 +01:00 |
|
Laurent Destailleur
|
f2c7d3de2e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:25:23 +01:00 |
|
Laurent Destailleur
|
5dbf060f00
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-12-09 13:24:01 +01:00 |
|
Laurent Destailleur
|
fba274997a
|
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
Fix dolGetBadge class
|
2019-12-09 13:05:07 +01:00 |
|
Laurent Destailleur
|
eb0d20b77e
|
Fix label of country
Fix div empty
|
2019-12-09 09:16:59 +01:00 |
|
Alfredo Altamirano
|
39afe39016
|
Bugfix: Module builder missing table prefix
The function rebuildObjectSql from the module builder module is missing the table prefix when adding a constraint
|
2019-12-08 19:29:46 -06:00 |
|
Laurent Destailleur
|
2ca5a4378b
|
Fix empty div when no address
Fix deletion of MO
|
2019-12-09 00:54:42 +01:00 |
|
Laurent Destailleur
|
394104291a
|
Fix function not found when creating a payment of an expense report
|
2019-12-08 04:22:09 +01:00 |
|
ATM John BOTELLA
|
4d3ed4ffd3
|
Fix dolGetBadge class
|
2019-12-07 17:41:13 +01:00 |
|
Laurent Destailleur
|
d58a6a7d9a
|
Fix hreflang is more complete
|
2019-12-07 16:59:35 +01:00 |
|
Laurent Destailleur
|
0e063a3bb3
|
Fix hreflang tag (must include itself)
|
2019-12-07 15:46:14 +01:00 |
|
Laurent Destailleur
|
3f0fd9b82a
|
Fix url
|
2019-12-07 13:36:37 +01:00 |
|
Laurent Destailleur
|
ff05150f7e
|
Fix link for alternate language
|
2019-12-07 13:25:59 +01:00 |
|
Laurent Destailleur
|
7f23c5f74e
|
Fix link for alternate language
|
2019-12-07 13:21:11 +01:00 |
|
Laurent Destailleur
|
a2da98c08a
|
Fix $db not defined
|
2019-12-07 13:19:12 +01:00 |
|
Laurent Destailleur
|
7be8b14368
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-07 13:10:07 +01:00 |
|
Laurent Destailleur
|
3030a9fa2a
|
Fix manifest file was saved but not enabled.
|
2019-12-07 13:09:55 +01:00 |
|
Laurent Destailleur
|
8138fa9780
|
Missing X-Content-Type-Options: nosniff on header of website pages
|
2019-12-07 11:51:21 +01:00 |
|
Laurent Destailleur
|
91d83c3d60
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-12-06 17:40:43 +01:00 |
|
Laurent Destailleur
|
796f34628d
|
Debug v11
|
2019-12-06 17:40:22 +01:00 |
|
Scrutinizer Auto-Fixer
|
4debd71281
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-06 08:26:49 +00:00 |
|
Laurent Destailleur
|
cb497cb08e
|
Translation
|
2019-12-06 08:58:16 +01:00 |
|
Laurent Destailleur
|
f74e1f8fa3
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-06 08:11:23 +01:00 |
|
Laurent Destailleur
|
a7571054f0
|
Fix if exif not available
|
2019-12-04 22:19:35 +01:00 |
|
Laurent Destailleur
|
553bb728c6
|
Fix break not necessary
|
2019-12-04 22:13:50 +01:00 |
|
Laurent Destailleur
|
bde917d7fc
|
Fix responsive
|
2019-12-04 15:09:20 +01:00 |
|
Laurent Destailleur
|
9878eddd75
|
Fix phpcs
|
2019-12-03 22:52:20 +01:00 |
|
Laurent Destailleur
|
a75915a7a8
|
Fix regression
|
2019-12-03 22:37:58 +01:00 |
|
Laurent Destailleur
|
60d3bd0fe9
|
Fix regression
|
2019-12-03 22:36:26 +01:00 |
|
Laurent Destailleur
|
558e0cb5f6
|
Fix regression
|
2019-12-03 22:34:49 +01:00 |
|
Laurent Destailleur
|
22b17190e8
|
Update pdf.lib.php
|
2019-12-03 22:26:33 +01:00 |
|
stickler-ci
|
24b5b9bd72
|
Fixing style errors.
|
2019-12-03 18:42:29 +00:00 |
|
Philippe GRAND
|
0ce1e5c007
|
Fix : Fatal error: Uncaught Error: Class Facture not found
|
2019-12-03 19:39:32 +01:00 |
|
Laurent Destailleur
|
576006ff6c
|
Merge pull request #12605 from atm-john/10.0_fix_exif_images
Fix Use dynamically exif image information with conf MAIN_USE_EXIF_ROTATION
|
2019-12-03 17:57:19 +01:00 |
|
John Botella
|
e46f654e9f
|
Fix deprecated image2wbmp function
|
2019-12-03 17:27:13 +01:00 |
|
Laurent Destailleur
|
d93cfedcbe
|
Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview
Add preview button for MD, CSS, XAML files
|
2019-12-03 13:20:08 +01:00 |
|
Scrutinizer Auto-Fixer
|
36a74cd160
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-03 10:17:29 +00:00 |
|
John Botella
|
f806c0da78
|
Fix comment missing
|
2019-12-03 09:29:04 +01:00 |
|
John Botella
|
2b01576aa9
|
Fix comment
|
2019-12-03 09:24:11 +01:00 |
|
John Botella
|
3b72cade4e
|
Fix exif image with conf MAIN_USE_EXIF_ROTATION
|
2019-12-02 17:32:06 +01:00 |
|
Tobias Sekan
|
f4e4e1e518
|
Add preview for MD, CSS, XAML files
|
2019-12-02 13:53:28 +01:00 |
|
Laurent Destailleur
|
6d81bc77cb
|
Fix look and feel v11
|
2019-12-02 11:00:09 +01:00 |
|
Laurent Destailleur
|
af5beade41
|
Merge pull request #12584 from atm-john/develop_add_link_to_widget
NEW link to widget
|
2019-12-01 19:13:10 +01:00 |
|
Laurent Destailleur
|
f378141fbd
|
PHPCS
|
2019-12-01 12:51:01 +01:00 |
|
Laurent Destailleur
|
3eec2430eb
|
Merge pull request #12585 from atm-john/develop_factoring_token_usage
Factoring token usage
|
2019-12-01 11:37:30 +01:00 |
|
Laurent Destailleur
|
790fdc881c
|
# WARNING: head commit changed in the meantime
Restore file for travis
|
2019-12-01 10:50:56 +01:00 |
|
Laurent Destailleur
|
bf99e8af5d
|
Fix phpcs
|
2019-12-01 10:33:55 +01:00 |
|
Laurent Destailleur
|
6bf3af5d83
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
|
2019-12-01 10:30:22 +01:00 |
|
ATM John BOTELLA
|
773f823748
|
factoring token usage
|
2019-12-01 10:20:11 +01:00 |
|
ATM John BOTELLA
|
096e50aaf6
|
add link to widget
|
2019-12-01 10:08:43 +01:00 |
|
Laurent Destailleur
|
1d564c2a39
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/core/class/notify.class.php
|
2019-12-01 00:58:01 +01:00 |
|
Laurent Destailleur
|
bfb8a4e8da
|
Merge pull request #12578 from Dolibarr/revert-12577-#12482
Revert "FIX#12482"
|
2019-12-01 00:55:13 +01:00 |
|
Laurent Destailleur
|
199b0c11af
|
Merge pull request #12572 from atm-maxime/fix_deposit
Fix deposit line was not translated in deposit invoice
|
2019-12-01 00:44:17 +01:00 |
|
Laurent Destailleur
|
7931bfa766
|
Merge pull request #12568 from atm-john/develop_fix_divide_by_zero
Fix division by zero
|
2019-11-30 23:29:11 +01:00 |
|
Laurent Destailleur
|
47b35e9011
|
Merge pull request #12570 from atm-maxime/fix_margin_rights
Fix margin rights
|
2019-11-30 23:28:26 +01:00 |
|
Laurent Destailleur
|
a352fd5a6e
|
Revert "FIX#12482"
|
2019-11-30 21:00:56 +01:00 |
|
Nicolas
|
f2ff443641
|
FIX #12482
|
2019-11-30 20:04:27 +01:00 |
|
Maxime Kohlhaas
|
558669dd88
|
Fix #6497 : deposit lines were not translated
|
2019-11-30 16:14:16 +01:00 |
|
Maxime Kohlhaas
|
2c165d0a61
|
Fix deposit date display in PDF
|
2019-11-30 15:53:50 +01:00 |
|
Maxime Kohlhaas
|
916954b301
|
Fix #12371 : access rights on contacts
|
2019-11-30 14:48:05 +01:00 |
|
ATM John BOTELLA
|
b7d39b610b
|
Fix divided by zero
|
2019-11-30 10:08:55 +01:00 |
|
Laurent Destailleur
|
35b4318cee
|
Merge pull request #12552 from frederic34/patch-15
$head was never initialized
|
2019-11-30 01:16:40 +01:00 |
|
Laurent Destailleur
|
3b9d2abcb2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/product.lib.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
htdocs/product/list.php
|
2019-11-29 11:42:08 +01:00 |
|
Laurent Destailleur
|
3acd0bc2ff
|
FIX Reduce number of request for list of products
|
2019-11-29 11:32:09 +01:00 |
|
Frédéric FRANCE
|
00a80e498e
|
$head was never initialized
|
2019-11-28 23:06:04 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Laurent Destailleur
|
540f47b998
|
Merge pull request #12523 from oscim/patch-11
Put $object in complete_head_from_modules
|
2019-11-28 12:20:16 +01:00 |
|
Laurent Destailleur
|
1e84b0ea97
|
Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
Scrutinizer Auto-Fixes
|
2019-11-28 12:19:43 +01:00 |
|
Laurent Destailleur
|
874f5b7005
|
Merge pull request #12528 from frederic34/patch-8
image2wbmp() is deprecated as of PHP 7.3.0
|
2019-11-28 12:19:32 +01:00 |
|
Laurent Destailleur
|
c0d349e9f7
|
Merge pull request #12530 from frederic34/patch-13
fix doxygen
|
2019-11-27 20:11:24 +01:00 |
|
Laurent Destailleur
|
c22fea52e5
|
Fix do not ping name of server
|
2019-11-27 11:38:30 +01:00 |
|
Laurent Destailleur
|
9a9a43fc4d
|
Return OS with ping
|
2019-11-27 11:34:10 +01:00 |
|
Frédéric FRANCE
|
757d05e907
|
fix doxygen
|
2019-11-26 18:59:26 +01:00 |
|
Frédéric FRANCE
|
a04fa05b6c
|
image2wbmp() is deprecated as of PHP 7.3.0
https://www.php.net/manual/en/function.image2wbmp.php
image2wbmp() is deprecated as of PHP 7.3.0, and will be removed in the next major version. Use imagewbmp() instead.
|
2019-11-26 18:41:38 +01:00 |
|
oscim
|
1e6b93500a
|
Put $object in complete_head_from_modules
Add object for correctly usage in function complete_head_from_modules
|
2019-11-26 16:34:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
057ab6a059
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-26 11:52:04 +00:00 |
|
Laurent Destailleur
|
d1419f81da
|
Merge pull request #12390 from bb2a/patch-4
Use english name of subsitution variables for thirdparties
|
2019-11-26 10:26:45 +01:00 |
|
Laurent Destailleur
|
b44817f2bf
|
Merge pull request #12518 from frederic34/patch-17
doxygen
|
2019-11-26 09:10:47 +01:00 |
|
Frédéric FRANCE
|
1ccf0808d0
|
doxygen
|
2019-11-26 00:28:26 +01:00 |
|
andreubisquerra
|
6baa1c8d4a
|
Fix travis
|
2019-11-25 23:32:40 +01:00 |
|
andreubisquerra
|
b2e995279e
|
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
|
2019-11-25 19:29:07 +01:00 |
|
Laurent Destailleur
|
bc5270ce76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/facture/card.php
|
2019-11-24 18:15:25 +01:00 |
|
Laurent Destailleur
|
cf0311dd6a
|
FIX Hook getAccessForbiddenMessage was missing parameters
|
2019-11-22 16:13:22 +01:00 |
|
Laurent Destailleur
|
e8bc8b68c1
|
Fix missing field in migration
|
2019-11-21 18:17:40 +01:00 |
|
Anthony Berton
|
496aa0c065
|
Update functions.lib.php
|
2019-11-21 10:38:59 +01:00 |
|
Scrutinizer Auto-Fixer
|
cd7523318d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-19 08:30:26 +00:00 |
|
Laurent Destailleur
|
16d67a1a8e
|
Fix several trouble with some types in modulebuilder
Fix difference between null and 0
|
2019-11-17 17:36:36 +01:00 |
|
Anthony Berton
|
fe3c921152
|
Merge branch 'develop' into patch-4
|
2019-11-17 10:17:47 +01:00 |
|
Anthony Berton
|
e1f36ae107
|
Update functions.lib.php
|
2019-11-16 17:37:18 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
Laurent Destailleur
|
411e9c87e3
|
Debug feature to set sender profiles
|
2019-11-14 11:53:28 +01:00 |
|
Laurent Destailleur
|
52787b56b2
|
Fix when limit = 0
Look and feel v11
|
2019-11-14 11:00:49 +01:00 |
|
Laurent Destailleur
|
171b94fc5c
|
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:24 +01:00 |
|
Laurent Destailleur
|
86094613e8
|
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2019-11-14 08:50:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00: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
|
8a527631a0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:35:02 +00:00 |
|
Laurent Destailleur
|
ede05e03ba
|
Merge pull request #12417 from frederic34/patch-7
doxygen
|
2019-11-13 18:34:29 +01:00 |
|
Laurent Destailleur
|
7118dbbd1d
|
Fix var not defined
|
2019-11-13 18:25:48 +01:00 |
|
Laurent Destailleur
|
89bf35a8bf
|
Fix default value show must match the theme selected
|
2019-11-12 21:54:41 +01:00 |
|
Frédéric FRANCE
|
7ce297c6cc
|
doxygen
|
2019-11-12 21:53:17 +01:00 |
|
Laurent Destailleur
|
03e35623c6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-12 00:43:37 +01:00 |
|
Laurent Destailleur
|
8be0a6d470
|
Fix: Can set savingdocmask by caller. Fix permissions names.
Fix: Disable crop on svg images.
|
2019-11-12 00:43:26 +01:00 |
|
Scrutinizer Auto-Fixer
|
038bda254d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 22:59:36 +00:00 |
|
Laurent Destailleur
|
5eb03cf6ad
|
Avoid false positive.
|
2019-11-11 13:26:48 +01:00 |
|
Laurent Destailleur
|
771f304c79
|
Fix typo
|
2019-11-09 18:40:08 +01:00 |
|
Anthony Berton
|
4449c6d2a7
|
Update functions.lib.php
|
2019-11-08 16:34:20 +01:00 |
|
Laurent Destailleur
|
d1c49c7021
|
Fix trans
|
2019-11-08 10:24:03 +01:00 |
|
Laurent Destailleur
|
34beca0758
|
Fix var not not consistent
|
2019-11-07 16:33:11 +01:00 |
|
Laurent Destailleur
|
8318db85a3
|
Fix typo
|
2019-11-07 16:32:44 +01:00 |
|
Laurent Destailleur
|
c0b8684475
|
Merge pull request #12341 from inoveaconseil/bankStatementDocument
NEW add upload for account statement
|
2019-11-07 15:06:47 +01:00 |
|
Nicolas
|
f18bca7687
|
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
|
2019-11-06 20:51:17 +01:00 |
|
Inovea Conseil
|
fed6ed8760
|
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
|
2019-11-06 20:48:24 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
stickler-ci
|
f537ae60b6
|
Fixing style errors.
|
2019-11-05 12:52:58 +00:00 |
|
Nicolas
|
991e1b2747
|
NEW Add upload document on account statement
|
2019-11-05 13:51:52 +01:00 |
|
Laurent Destailleur
|
747113551b
|
Debug pagination of bookmark list
|
2019-11-05 09:52:33 +01:00 |
|
Laurent Destailleur
|
1aef1c60dd
|
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
|
2019-11-04 21:10:22 +01:00 |
|
Laurent Destailleur
|
c276659acd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/ticket.lib.php
|
2019-11-04 20:37:49 +01:00 |
|
Laurent Destailleur
|
e60fff39d9
|
Fix phpcs
|
2019-11-04 20:36:55 +01:00 |
|
Laurent Destailleur
|
0347d82660
|
Merge pull request #12303 from frederic34/patch-2
css
|
2019-11-04 20:31:02 +01:00 |
|
Laurent Destailleur
|
ec8bd6327d
|
Fix css
|
2019-11-04 18:53:46 +01:00 |
|
Laurent Destailleur
|
6e591d2be0
|
Fix css
|
2019-11-04 18:25:32 +01:00 |
|
Laurent Destailleur
|
8aa2fd04ad
|
NEW The integrity checker now show the expected size of files
|
2019-11-04 13:23:48 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Laurent Destailleur
|
99a4781a42
|
Fix better support for multicurrency for template invoices
|
2019-11-03 18:58:26 +01:00 |
|
Frédéric FRANCE
|
3e2d89dc02
|
Update ticket.lib.php
|
2019-11-02 18:16:09 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Laurent Destailleur
|
df750b6a9d
|
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
NEW Add attendee to ical export + cleanup
|
2019-11-02 13:40:27 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
04a5054e1c
|
Merge pull request #12279 from atm-john/develop_ticket_file_display
New - ticket file download button display
|
2019-11-02 13:32:33 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
stickler-ci
|
b43d06db37
|
Fixing style errors.
|
2019-11-02 10:55:24 +00:00 |
|
Laurent Destailleur
|
37f4ebb1b2
|
Update xcal.lib.php
|
2019-11-02 11:56:01 +01:00 |
|
Laurent Destailleur
|
d9f333d828
|
Merge pull request #12289 from frederic34/datetime
php is > 5.4
|
2019-11-02 11:46:34 +01:00 |
|
Laurent Destailleur
|
f9031cdbfd
|
Clean code
|
2019-11-02 11:36:48 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Laurent Destailleur
|
8608c5db9c
|
Fix color of task progression
|
2019-11-01 23:16:08 +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
|
2af23aa658
|
Enhance modulebuilder
|
2019-11-01 17:54:17 +01:00 |
|
Laurent Destailleur
|
a1b2130247
|
Enhance the progress bar of tasks
|
2019-11-01 16:09:31 +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
|
da238e94e1
|
php is > 5.4
|
2019-11-01 15:21:21 +01:00 |
|
Sekan, Tobias
|
e27f1c623d
|
Merge branch 'AddAttendeeToIcal' of https://github.com/TobiasSekan/dolibarr into develop
|
2019-11-01 13:16:54 +01:00 |
|
Sekan, Tobias
|
885c6e6516
|
Fix wrong newline replacement
|
2019-11-01 13:16:14 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
stickler-ci
|
fee0a362ad
|
Fixing style errors.
|
2019-11-01 11:11:59 +00:00 |
|
Sekan, Tobias
|
2a983a6a7c
|
fix link in documentation
|
2019-11-01 12:09:43 +01:00 |
|
Sekan, Tobias
|
0bfff92032
|
Add attendee to ical export + cleanup
|
2019-11-01 11:59:54 +01:00 |
|
Laurent Destailleur
|
5b5a2e9804
|
Clean code
|
2019-11-01 03:25:09 +01:00 |
|
Laurent Destailleur
|
c215d534fc
|
Fix phpcs
|
2019-10-31 21:16:41 +01:00 |
|
Laurent Destailleur
|
f98df3c807
|
NEW Can edit link to the translation page in website module
|
2019-10-31 21:09:33 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
John Botella
|
d0a5e30faa
|
Change btn name
|
2019-10-31 08:44:08 +01:00 |
|
Frédéric FRANCE
|
f7747ed00a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-30 20:06:43 +01:00 |
|
John Botella
|
0cff122ccd
|
Add file display in ticket
|
2019-10-30 17:46:18 +01:00 |
|
Laurent Destailleur
|
2770f79a86
|
Merge pull request #12216 from frederic34/patch-5
css
|
2019-10-30 03:02:24 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Laurent Destailleur
|
bf0400a29b
|
Merge pull request #12252 from oscim/patch-10
Update admin.lib.php
|
2019-10-30 02:41:59 +01:00 |
|
Laurent Destailleur
|
f03bf149bd
|
Fix autoselect of field with modulebuilder
|
2019-10-30 02:09:29 +01:00 |
|
Laurent Destailleur
|
4eedf4a113
|
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-10-29 11:48:36 +01:00 |
|
Laurent Destailleur
|
9483e367ca
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:48:11 +01:00 |
|
Laurent Destailleur
|
e58ecaaa64
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:43:35 +01:00 |
|
stickler-ci
|
52ef2bb990
|
Fixing style errors.
|
2019-10-29 10:16:49 +00:00 |
|
oscim
|
d310ca6e82
|
Update admin.lib.php
add function modulehelp_prepare_head
|
2019-10-29 11:15:03 +01:00 |
|
Laurent Destailleur
|
5e06fe0712
|
FIX Avoid fatal error when creating thumb from PDF
|
2019-10-29 11:11:13 +01:00 |
|
Frédéric FRANCE
|
e2afcfb999
|
clean indent
|
2019-10-27 11:53:20 +01:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Frédéric FRANCE
|
83ed70f72f
|
Update agenda.lib.php
|
2019-10-24 22:44:51 +02:00 |
|
Laurent Destailleur
|
2814a5c07b
|
Fix phpcs
|
2019-10-24 21:47:31 +02:00 |
|
Laurent Destailleur
|
b45ee20696
|
NEW Add a tab to setup "Opening hours" of company (information only)
|
2019-10-24 21:29:07 +02:00 |
|
Laurent Destailleur
|
b48f08dd07
|
Theme v11
|
2019-10-23 20:12:29 +02:00 |
|
Laurent Destailleur
|
41303006f3
|
Rename constant
|
2019-10-23 17:48:55 +02:00 |
|
Laurent Destailleur
|
f4545a2068
|
Debug method MAIN_STATUS_USES_CSS
|
2019-10-23 17:31:54 +02:00 |
|
Laurent Destailleur
|
da00591bba
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2019-10-23 04:04:32 +02:00 |
|
Laurent Destailleur
|
c4be61c55c
|
FIX Better compatible fix for the trouble of weight / size units
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
|
2019-10-22 18:42:59 +02:00 |
|
Laurent Destailleur
|
e7e9898e0d
|
FIX Better compatible fix for the trouble of weight / size units
|
2019-10-22 18:36:36 +02:00 |
|
Laurent Destailleur
|
8242281ef8
|
Close #12096
|
2019-10-22 14:39:33 +02:00 |
|
Laurent Destailleur
|
b2bbee55f1
|
Fix phpcs
|
2019-10-22 12:37:36 +02:00 |
|
Anthony Berton
|
5e7d615250
|
Update functions.lib.php
|
2019-10-21 21:06:48 +02:00 |
|
Frédéric FRANCE
|
86f22c4563
|
do not ignore lines with mix od tabs and spaces
|
2019-10-20 17:17:22 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
49c101bb77
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-20 15:16:51 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Laurent Destailleur
|
84f6fd64a9
|
Merge pull request #12176 from Ahuahuachi/develop
Translation of some function documentation
|
2019-10-20 13:31:25 +02:00 |
|
Laurent Destailleur
|
62a8523ccf
|
Merge pull request #12178 from frederic34/patch-18
Update functions2.lib.php
|
2019-10-20 12:40:34 +02:00 |
|
stickler-ci
|
66a2dc4994
|
Fixing style errors.
|
2019-10-20 09:18:55 +00:00 |
|
Frédéric FRANCE
|
33c35780e0
|
wip
|
2019-10-20 11:17:54 +02:00 |
|
Frédéric FRANCE
|
f0a3d1a1c4
|
Update functions2.lib.php
|
2019-10-18 23:20:34 +02:00 |
|
Alfredo Altamirano
|
71f9b4f36b
|
Translation of parameter documentation
|
2019-10-18 12:55:21 -05:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Laurent Destailleur
|
4d9c285126
|
Merge pull request #12163 from sadlig/fix-stock-movement-right
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:53:17 +02:00 |
|
Gildas
|
132ea56a59
|
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:06:38 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
6d05d42c50
|
Look and feel v11
|
2019-10-16 11:26:20 +02:00 |
|
Laurent Destailleur
|
63a60c7811
|
NEW Add option MAIN_PDF_FORCE_FONT_SIZE
|
2019-10-15 11:13:14 +02:00 |
|
Frédéric FRANCE
|
d1d9b1ed85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-15 09:39:57 +02:00 |
|
Laurent Destailleur
|
2ed96c9e5f
|
Fix scrutinizer
|
2019-10-15 02:54:19 +02:00 |
|
Laurent Destailleur
|
a1c93cb2e6
|
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
Look and feel v11
|
2019-10-15 02:45:12 +02:00 |
|
Laurent Destailleur
|
c869cbe193
|
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
Unlock title button feature
|
2019-10-14 23:55:10 +02:00 |
|
Laurent Destailleur
|
7b1b51e752
|
Merge pull request #12115 from TobiasSekan/develop
Fix MS Outlook import error
|
2019-10-14 20:54:30 +02:00 |
|
Laurent Destailleur
|
3b84e2bac3
|
Use img-thumb css
|
2019-10-14 19:21:13 +02:00 |
|
Tobias Sekan
|
e2ca646b6e
|
Fix MS Outlook import error
|
2019-10-14 10:22:47 +02:00 |
|
Frédéric FRANCE
|
c143584af4
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 21:16:54 +02:00 |
|
Laurent Destailleur
|
c338db6c36
|
Fix unlink picto
|
2019-10-12 19:16:36 +02:00 |
|
Frédéric FRANCE
|
d9ba09bec1
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-12 19:02:24 +02:00 |
|
Laurent Destailleur
|
9ba992b8b6
|
Work on inventory module
|
2019-10-12 12:31:35 +02:00 |
|
Laurent Destailleur
|
95305a313d
|
Fix trans
|
2019-10-11 17:02:35 +02:00 |
|
Laurent Destailleur
|
60bdb3133e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-11 16:57:56 +02:00 |
|
Laurent Destailleur
|
b58c2c38b2
|
Fix missing token
|
2019-10-11 16:57:47 +02:00 |
|
Laurent Destailleur
|
3f62a6d532
|
Merge pull request #12093 from frederic34/patch-23
fix search by roles
|
2019-10-11 16:57:33 +02:00 |
|
Frédéric FRANCE
|
367ef4acaf
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-11 16:44:25 +02:00 |
|
Laurent Destailleur
|
cc73877e03
|
Merge branch 'develop' into patch-18
|
2019-10-11 16:32:48 +02:00 |
|
Laurent Destailleur
|
541357027e
|
Merge pull request #12077 from frederic34/patch-15
globe fontawesome
|
2019-10-11 16:31:37 +02:00 |
|
Laurent Destailleur
|
9251f04d63
|
Update thumbs of themes
|
2019-10-11 13:26:48 +02:00 |
|
Laurent Destailleur
|
5801d09dbe
|
NEW Use the squarre logo as favicon of pages
|
2019-10-11 12:28:13 +02:00 |
|
John Botella
|
9194eb4bec
|
Fix block title height if no button
|
2019-10-11 09:14:10 +02:00 |
|
John Botella
|
724999f1ce
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-11 08:40:43 +02:00 |
|
Frédéric FRANCE
|
c80d055af3
|
fix search by roles
|
2019-10-10 23:51:54 +02:00 |
|
Frédéric FRANCE
|
03bbfc6ad9
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-10 23:24:50 +02:00 |
|
Laurent Destailleur
|
e7f56b67d8
|
Look and feel v11
|
2019-10-10 23:00:33 +02:00 |
|
Laurent Destailleur
|
aebae5ff83
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
|
2019-10-10 10:37:17 +02:00 |
|
Frédéric FRANCE
|
be00576717
|
Update functions.lib.php
|
2019-10-10 08:22:14 +02:00 |
|
Frédéric FRANCE
|
d4757a0b5b
|
globe fontawesome
|
2019-10-09 23:20:15 +02:00 |
|
Laurent Destailleur
|
072a0a26d6
|
Use a font awesome icon to show "shippable" flag on orders.
|
2019-10-09 18:07:00 +02:00 |
|
Laurent Destailleur
|
db651a607d
|
Use fontawesome for img_warning
|
2019-10-09 17:33:46 +02:00 |
|
Laurent Destailleur
|
f2d04fe55c
|
Code comment
|
2019-10-09 11:51:10 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
f55a4d77e4
|
css
|
2019-10-08 16:41:03 +02:00 |
|
Laurent Destailleur
|
d55b7689bb
|
Merge pull request #11920 from ptibogxiv/patch-264
NEW translation for member type
|
2019-10-08 09:00:49 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
Laurent Destailleur
|
297313e7de
|
CSS
|
2019-10-07 16:01:36 +02:00 |
|
Laurent Destailleur
|
c6c498fd67
|
Merge pull request #11829 from atm-florian/dev_contactdefault
NEW : Address/Contact by default on third parties
|
2019-10-07 15:27:58 +02:00 |
|
ptibogxiv
|
9aa7226d39
|
Update member.lib.php
|
2019-10-07 13:38:05 +02:00 |
|
Laurent Destailleur
|
e02794248e
|
Merge branch 'develop' into patch-264
|
2019-10-07 13:25:16 +02:00 |
|
Laurent Destailleur
|
1060ac4608
|
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
Fix : LibStatut missing dolgetstatus usage
|
2019-10-07 13:08:33 +02:00 |
|
Laurent Destailleur
|
c2a7ae23bc
|
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
|
2019-10-07 13:03:27 +02:00 |
|
Frédéric FRANCE
|
ec8569dd85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-06 15:56:21 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
6384e7eb67
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-05 20:02:16 +02:00 |
|
Laurent Destailleur
|
b883a8092a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
|
2019-10-05 19:35:40 +02:00 |
|
Laurent Destailleur
|
ac8837d01f
|
Fix url
|
2019-10-05 19:28:00 +02:00 |
|
Laurent Destailleur
|
7f5ccf4b8e
|
Remove google+
|
2019-10-05 19:27:14 +02:00 |
|
Laurent Destailleur
|
031c5523d4
|
NEW Add link to the public interface on the ticket card.
|
2019-10-05 11:52:30 +02:00 |
|
stickler-ci
|
bc32d684a4
|
Fixing style errors.
|
2019-10-04 16:12:33 +00:00 |
|
florian HENRY
|
2d3dd9ed3c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-10-04 18:10:16 +02:00 |
|
Laurent Destailleur
|
503973cec9
|
FIX Edit of ticket module parameters erased others
|
2019-10-04 14:04:31 +02:00 |
|
ATM john
|
027c8224b0
|
Fix dolGetStatus unused
|
2019-10-03 21:34:01 +02:00 |
|
Alexandre SPANGARO
|
ddadff5731
|
Add globe fa-icon
|
2019-10-03 21:32:55 +02:00 |
|
ATM john
|
77f666a236
|
Fix dolGetStatus param
|
2019-10-03 21:28:11 +02:00 |
|
Alexandre SPANGARO
|
8668e7157a
|
Add bookmark fa-icon
|
2019-10-03 21:00:59 +02:00 |
|
Alexandre SPANGARO
|
d0840b038f
|
Remove constant MAIN_DISABLE_FONT_AWESOME_5
|
2019-10-03 20:42:02 +02:00 |
|
Alexandre SPANGARO
|
14381927c7
|
Fix Bank Fa-icon
|
2019-10-03 20:32:15 +02:00 |
|
Frédéric FRANCE
|
0383fdbeee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 18:37:14 +02:00 |
|
Laurent Destailleur
|
c223c5635b
|
Merge pull request #12010 from laudeco/feature/12006-country-on-pdf-footer
[#12006] - adds the country in the address of the PDF's footer
|
2019-10-03 18:15:39 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
Laurent Destailleur
|
e59c70116f
|
Merge pull request #12021 from frederic34/patch-14
fix broken search
|
2019-10-03 15:57:31 +02:00 |
|
Laurent Destailleur
|
b60ee4c18c
|
css
|
2019-10-03 09:58:49 +02:00 |
|
Frédéric FRANCE
|
feaa5e2bd0
|
json query path
|
2019-10-02 22:15:24 +02:00 |
|
Frédéric FRANCE
|
6d117a501a
|
Update company.lib.php
|
2019-10-02 22:11:27 +02:00 |
|
Frédéric FRANCE
|
453ae05030
|
Update company.lib.php
|
2019-10-02 22:09:50 +02:00 |
|
Frédéric FRANCE
|
9f7f263f79
|
fix broken search
|
2019-10-02 21:49:36 +02:00 |
|
Frédéric FRANCE
|
37bb548d21
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 20:56:32 +02:00 |
|
Laurent Destailleur
|
b6a95b4be5
|
Look and feel v11
|
2019-10-02 19:04:24 +02:00 |
|
Frédéric FRANCE
|
3afb4355a8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 18:59:18 +02:00 |
|
Laurent Destailleur
|
f89701b4d4
|
Fix technical id align on left
|
2019-10-02 18:55:18 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
florian HENRY
|
8c9cee1565
|
resolve conflict
|
2019-10-02 12:49:38 +02:00 |
|
florian HENRY
|
371ff76f5e
|
resolve copflict
|
2019-10-02 12:46:35 +02:00 |
|
Laurent Destailleur
|
ba7a288abb
|
Fix colspan and columns of contact of thirdparties
|
2019-10-01 23:28:13 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
Frédéric FRANCE
|
26c34198bf
|
show contact
|
2019-10-01 21:38:16 +02:00 |
|
Laurent De Coninck
|
3a25beabe6
|
add the country in the address of the PDF's footer
|
2019-10-01 21:03:58 +02:00 |
|
ATM john
|
4d5ffbb5c4
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
|
2019-10-01 20:45:04 +02:00 |
|
florian HENRY
|
d48f0fa791
|
resolve conflixt
|
2019-10-01 18:07:59 +02:00 |
|
Laurent Destailleur
|
b79831ec39
|
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
|
2019-10-01 14:48:21 +02:00 |
|
Frédéric FRANCE
|
3b9bf2b06a
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 12:25:34 +02:00 |
|
Laurent Destailleur
|
fa921739ec
|
Remove duplicate code
|
2019-10-01 12:03:17 +02:00 |
|
Laurent Destailleur
|
11e01f5c86
|
Use correct style for table header
|
2019-10-01 12:02:28 +02:00 |
|
Laurent Destailleur
|
15e646cc62
|
Fix bad name of trigger
|
2019-10-01 11:34:35 +02:00 |
|
Laurent Destailleur
|
c7da05e4a1
|
Fix bad name of trigger
|
2019-10-01 11:28:10 +02:00 |
|
Laurent Destailleur
|
6ebd060315
|
Use php var with same name than html var
|
2019-10-01 11:23:38 +02:00 |
|
Laurent Destailleur
|
0828000626
|
Merge pull request #12005 from laudeco/feature/filter_contacts
working solution about filtering the contacs of one company
|
2019-10-01 11:19:29 +02:00 |
|
Laurent Destailleur
|
0f4f5d47f2
|
Update company.lib.php
|
2019-10-01 11:18:53 +02:00 |
|
Laurent Destailleur
|
955d9daf38
|
Update company.lib.php
|
2019-10-01 11:18:14 +02:00 |
|
stickler-ci
|
5e075d5d30
|
Fixing style errors.
|
2019-10-01 06:39:26 +00: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 |
|
ATM john
|
b01bd979b5
|
Unlock title button feature
|
2019-09-30 21:10:16 +02:00 |
|
Frédéric FRANCE
|
f32f528bc2
|
fix merge
|
2019-09-30 19:36:57 +02:00 |
|
Frédéric FRANCE
|
b87610adcc
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-30 19:34:35 +02:00 |
|
Laurent Destailleur
|
ecc2e8df67
|
Fix restore lost images
|
2019-09-30 17:58:31 +02:00 |
|
Laurent Destailleur
|
dc7ad61940
|
Add class reposition on button that switch the view mode
|
2019-09-30 17:46:53 +02:00 |
|
Laurent Destailleur
|
b390cff172
|
Fix css
|
2019-09-30 17:22:22 +02:00 |
|
Laurent Destailleur
|
ce7e8c83a3
|
Use a dedicated css imgforviewmode for button used to switch view
|
2019-09-30 17:08:57 +02:00 |
|
Laurent Destailleur
|
d65af06d20
|
Merge pull request #11869 from atm-john/new_ticket_messaging_page
New ticket messaging page design
|
2019-09-30 15:34:35 +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 |
|
Laurent Destailleur
|
bbc98c19bc
|
Update functions.lib.php
|
2019-09-30 15:25:55 +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
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
Laurent Destailleur
|
6966651d51
|
Standardize code to use dolSqlDateFilter
|
2019-09-28 13:22:05 +02:00 |
|
Alexandre SPANGARO
|
288aea190b
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-28 06:09:40 +02:00 |
|
Alexandre SPANGARO
|
7f93f046e9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-28 06:02:25 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
florian HENRY
|
885d958e63
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-27 20:12:09 +02:00 |
|
Laurent Destailleur
|
fd37a81e19
|
FIX #11861
|
2019-09-27 20:02:33 +02:00 |
|
Laurent Destailleur
|
981c5c877a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-27 20:02:08 +02:00 |
|
Laurent Destailleur
|
24ad67e0e1
|
Fix missing $conf
|
2019-09-27 20:01:57 +02:00 |
|
Laurent Destailleur
|
d0d884742f
|
FIX #11861 Not consistent code to manage measuring units
|
2019-09-27 19:45:33 +02:00 |
|
Laurent Destailleur
|
66cbb4020b
|
Merge branch 'develop' into patch-4
|
2019-09-27 14:46:39 +02:00 |
|
Alexandre SPANGARO
|
4b73e09c60
|
Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon
|
2019-09-27 14:20:53 +02:00 |
|
Laurent Destailleur
|
f3bc319a78
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
|
2019-09-27 14:11:14 +02:00 |
|
Laurent Destailleur
|
f96c9c3bb5
|
FIX #11931 #11963
|
2019-09-27 11:51:34 +02:00 |
|
Alexandre SPANGARO
|
e38bb89a2e
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-27 11:48:40 +02:00 |
|
Laurent Destailleur
|
6fbb5c0db7
|
Merge pull request #11963 from aspangaro/11.0_fa_icon
#11931 NEW Add fa_icon "tools" for load_fiche_titre
|
2019-09-27 11:38:44 +02:00 |
|
Laurent Destailleur
|
e03667dc75
|
Merge pull request #11939 from frederic34/patch-17
fix badge linked resources on fichinter
|
2019-09-27 11:32:27 +02:00 |
|
Frédéric FRANCE
|
03086026b8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-27 08:06:13 +02:00 |
|
Laurent Destailleur
|
aa5f35f14f
|
Fix image on ticket
|
2019-09-26 14:28:34 +02:00 |
|
Laurent De Coninck
|
040e7bdfdf
|
working solution about filtering the contacs of one company
|
2019-09-25 18:24:36 +02:00 |
|
Alexandre SPANGARO
|
f4929c5315
|
NEW Add fa_icon "tools" for load_fiche_titre
|
2019-09-25 15:24:52 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
19c78d42e9
|
Fix az09 -> aZ09
|
2019-09-24 14:20:29 +02:00 |
|
Laurent Destailleur
|
6431e8e16d
|
FIX SQL injection on qty
|
2019-09-24 12:43:44 +02:00 |
|
Laurent Destailleur
|
7b3e64d67f
|
NEW Support of Extrafields on Leave requests.
|
2019-09-24 12:01:18 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
40f75b16d8
|
FIX Substitution of __PROJECT_XXX__ not done
|
2019-09-23 13:04:22 +02:00 |
|
Frédéric FRANCE
|
44ba0deae6
|
fix badge linked resources on fichinter
|
2019-09-20 17:58:22 +02:00 |
|
Laurent Destailleur
|
345ac28c89
|
Fix js injection
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/user/group/card.php
|
2019-09-18 14:21:02 +02:00 |
|
John Botella
|
d72548bd76
|
add filters
|
2019-09-18 13:43:34 +02:00 |
|
Laurent Destailleur
|
3f6afa810c
|
Code comment
|
2019-09-17 17:55:30 +02:00 |
|
ptibogxiv
|
c8bfd2c7c2
|
NEW translation for member type
usefull for sync with API and multilanguage front end or application
|
2019-09-17 13:37:34 +02:00 |
|
Frédéric FRANCE
|
e43f3a0f58
|
Update functions.lib.php
|
2019-09-16 18:07:06 +02:00 |
|
Frédéric FRANCE
|
5c00712c0a
|
Update functions.lib.php
|
2019-09-16 17:57:40 +02:00 |
|
John Botella
|
010e58d957
|
Add switch view behavior
|
2019-09-16 13:56:07 +02:00 |
|
Laurent Destailleur
|
544a1237bc
|
FIX regression with option to hide picto on top menu
|
2019-09-15 15:11:13 +02:00 |
|
Laurent Destailleur
|
7019e69ee2
|
FIX regression with option to hide picto on top menu
|
2019-09-15 15:09:36 +02:00 |
|
Frédéric FRANCE
|
904d0ecaee
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 18:42:31 +02:00 |
|
Laurent Destailleur
|
9f6fe0bf5a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/orders.lang
|
2019-09-14 18:27:58 +02:00 |
|
Laurent Destailleur
|
584549df11
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/accountancy/index.php
|
2019-09-14 18:25:31 +02:00 |
|
Laurent Destailleur
|
697b25aa82
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-09-14 18:24:00 +02:00 |
|
Laurent Destailleur
|
56e070cd7f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/accountancy/index.php
|
2019-09-14 18:23:20 +02:00 |
|
Frédéric FRANCE
|
6444c7378f
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-14 16:40:23 +02:00 |
|
Laurent Destailleur
|
166d56f7a3
|
Removed function dol_micro_time. Use native PHP microtime instead.
|
2019-09-13 11:15:49 +02:00 |
|
Frédéric FRANCE
|
de3a67f5bd
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-12 21:52:06 +02:00 |
|
Frédéric FRANCE
|
0d3a2f800b
|
fix colspan in show_project
|
2019-09-12 21:39:57 +02:00 |
|
ATM john
|
859904587f
|
add private support and title buttons
|
2019-09-12 21:17:48 +02:00 |
|
Frédéric FRANCE
|
6f33874d75
|
add entity
|
2019-09-12 21:13:00 +02:00 |
|
Frédéric FRANCE
|
cd109d04cd
|
add function
|
2019-09-12 20:44:24 +02:00 |
|
John Botella
|
7dcb871048
|
Fix private message type
|
2019-09-12 18:39:29 +02:00 |
|
Laurent Destailleur
|
56a99f6e6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-12 11:22:13 +02:00 |
|
florian HENRY
|
d6dcbc714c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-12 09:38:14 +02:00 |
|
stickler-ci
|
b2187c829a
|
Fixing style errors.
|
2019-09-11 22:44:17 +00:00 |
|
ATM john
|
bf924f113e
|
Add more style ans edit button
|
2019-09-12 00:37:36 +02:00 |
|
Laurent Destailleur
|
84e197e48a
|
Clean code
|
2019-09-12 00:09:49 +02:00 |
|
Laurent Destailleur
|
d7d764e5f9
|
Fix var not defined
|
2019-09-11 23:56:53 +02:00 |
|
ATM john
|
907669bb51
|
New ticket messaging page
|
2019-09-11 23:30:09 +02:00 |
|
Frédéric FRANCE
|
e0f17cc71c
|
add socialnetworks dictionary
|
2019-09-11 22:47:23 +02:00 |
|
Frédéric FRANCE
|
3fddef0c9e
|
add socialnetworks dictionary
|
2019-09-11 22:27:09 +02:00 |
|
Laurent Destailleur
|
3f3282400a
|
FIX SQL syntax error and CSRF check on vat reports
|
2019-09-11 13:57:15 +02:00 |
|
Laurent Destailleur
|
5f236fda2e
|
More complete error message with hour/min/sec
|
2019-09-11 00:28:09 +02:00 |
|
Laurent Destailleur
|
eb2f48332b
|
Show first line of code
|
2019-09-10 15:58:56 +02:00 |
|
Laurent Destailleur
|
48aedcee20
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2019-09-10 15:31:29 +02:00 |
|
Laurent Destailleur
|
d4e26fcc55
|
FIX missing include (dol_convert_file not found)
|
2019-09-10 15:29:33 +02:00 |
|
florian HENRY
|
42cd15400d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-09 14:12:34 +02:00 |
|
Laurent Destailleur
|
d3bc05de76
|
Merge pull request #11848 from atm-john/add_progress_to_global_task_list
Add progress to global task list
|
2019-09-09 13:08:53 +02:00 |
|
Laurent Destailleur
|
235cfa5a5b
|
Merge pull request #11846 from atm-john/fix_missing_total_progress
Fix missing total progress column
|
2019-09-09 13:07:10 +02:00 |
|
florian HENRY
|
63a83a0fa5
|
resolve conflict
|
2019-09-09 11:35:37 +02:00 |
|
Laurent Destailleur
|
73c3fa40bf
|
Update phpunit
|
2019-09-09 10:53:13 +02:00 |
|
Laurent Destailleur
|
15eaa5cbd8
|
NEW Public holidays are now in a table (no more hard coded per country)
|
2019-09-09 10:27:56 +02:00 |
|
florian HENRY
|
bdb297a380
|
resolve conflict
|
2019-09-09 10:15:44 +02:00 |
|
ATM john
|
ecddeb2b8b
|
Add progress to global task list
|
2019-09-08 21:19:15 +02:00 |
|
ATM john
|
fa5cda2e88
|
Fix missing total progress column
|
2019-09-08 18:03:14 +02:00 |
|
Laurent Destailleur
|
f08c07f315
|
Fix bugs reported by scrutinizer
|
2019-09-06 10:42:51 +02:00 |
|
florian HENRY
|
dff7be59c8
|
mostlyDone
|
2019-09-06 09:22:53 +02:00 |
|
Laurent Destailleur
|
37a32af7b0
|
NEW Add dictionary to store public holidays.
|
2019-09-05 20:19:13 +02:00 |
|
Laurent Destailleur
|
f893854986
|
Fix remove warnings
|
2019-09-05 14:24:13 +02:00 |
|
Laurent Destailleur
|
4a19f510fd
|
Fix scrutinizer reports
|
2019-09-05 13:58:35 +02:00 |
|
Laurent Destailleur
|
f4a7714f82
|
Fix bad log
|
2019-09-05 13:42:58 +02:00 |
|
Laurent Destailleur
|
9666200d6b
|
Enhance error management
|
2019-09-04 19:55:15 +02:00 |
|
Tim Otte
|
54d0b94b6d
|
Added extrafield support to the product supplier price lines
|
2019-09-04 15:13:42 +02:00 |
|
Laurent Destailleur
|
b445c0eec7
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/dolibarr_export.php
|
2019-09-03 22:40:26 +02:00 |
|
Laurent Destailleur
|
0a17e6bfd5
|
FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
|
2019-09-03 22:39:24 +02:00 |
|
florian HENRY
|
73c5b9617f
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
|
2019-09-03 17:07:59 +02:00 |
|
florian HENRY
|
6c20fbafdf
|
add trigger files
|
2019-09-03 17:04:42 +02:00 |
|
Laurent Destailleur
|
ca7ce63648
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/societe/class/societe.class.php
|
2019-09-02 23:04:15 +02:00 |
|
Laurent Destailleur
|
a126b1e538
|
FIX Add char $ and ; in sanitizing of filenames.
|
2019-09-02 22:25:44 +02:00 |
|
florian HENRY
|
d811de4da2
|
let only triggers part
|
2019-09-02 22:01:48 +02:00 |
|
Laurent Destailleur
|
a96742ee9b
|
Can search into global site files.
Support of cancel to previous page
|
2019-09-02 18:43:22 +02:00 |
|
Laurent Destailleur
|
c068177027
|
Work on search on global site files
|
2019-09-02 16:39:56 +02:00 |
|
florian HENRY
|
405c92640c
|
on going
|
2019-09-02 14:47:32 +02:00 |
|
florian HENRY
|
b535bc0cb9
|
start dev
|
2019-09-02 11:27:04 +02:00 |
|
Laurent Destailleur
|
29d2e7edd0
|
missing reposition
|
2019-09-02 04:39:36 +02:00 |
|
Laurent Destailleur
|
ee15ccf82e
|
missing reposition
|
2019-09-02 04:28:55 +02:00 |
|
Laurent Destailleur
|
40890ae345
|
Fix scrutinizer
|
2019-09-01 21:31:07 +02:00 |
|
Laurent Destailleur
|
04057cd83e
|
Prepare reengeneering of project usage
|
2019-09-01 02:02:38 +02:00 |
|
Laurent Destailleur
|
7f5728ead9
|
A better message when database is off.
|
2019-08-31 19:39:39 +02:00 |
|
Laurent Destailleur
|
2f49fc6a7b
|
Fix scrutinizer
|
2019-08-31 02:49:54 +02:00 |
|
Laurent Destailleur
|
a3e221468a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-31 01:15:04 +02:00 |
|
Laurent Destailleur
|
7942c5edf7
|
Fix js injection
|
2019-08-30 16:22:24 +02:00 |
|
Laurent Destailleur
|
01962cbc67
|
Clean code
|
2019-08-29 13:17:14 +02:00 |
|
Laurent Destailleur
|
ff7c122b6d
|
Add class specific to web page ref
|
2019-08-29 02:36:32 +02:00 |
|
Laurent Destailleur
|
76ae0cebd6
|
We don't need anymore code to manage dol_use_jmobile = 3 or 4
|
2019-08-29 01:32:10 +02:00 |
|
Laurent Destailleur
|
c10f755619
|
Fix compatibility with old multicompany modules
|
2019-08-29 00:19:46 +02:00 |
|
Laurent Destailleur
|
76e8384f09
|
NEW Add option multiselect for developers on the selector of language.
|
2019-08-28 16:06:19 +02:00 |
|
Laurent Destailleur
|
c0262f1e19
|
Fix type integer
|
2019-08-28 12:24:56 +02:00 |
|
Laurent Destailleur
|
9109eeaa77
|
Fix type integer
|
2019-08-28 12:24:35 +02:00 |
|
Laurent Destailleur
|
7236df37d4
|
FIX error management when adding a property with type real
|
2019-08-28 12:16:59 +02:00 |
|
Laurent Destailleur
|
ed42f59201
|
FIX error management when adding a property with type real
|
2019-08-28 12:10:28 +02:00 |
|
Laurent Destailleur
|
e3a4ad00d7
|
Code comment
|
2019-08-28 10:22:40 +02:00 |
|
Laurent Destailleur
|
04e11bcbd1
|
Doxygen
|
2019-08-27 20:35:42 +02:00 |
|
Laurent Destailleur
|
4ceb3c2e85
|
Add context 'ws' for web services authentication.
|
2019-08-27 20:35:06 +02:00 |
|
Laurent Destailleur
|
69688a22e0
|
Merge
|
2019-08-27 12:33:42 +02:00 |
|
Laurent Destailleur
|
22719b90b6
|
Fix remove warning
|
2019-08-27 12:31:15 +02:00 |
|
Laurent Destailleur
|
36c936357c
|
Add phpunit testDolStringIsGoodIso
|
2019-08-27 12:25:24 +02:00 |
|
Laurent Destailleur
|
60c3cefc53
|
FIX Api of documents work with value 'thirdparty'
|
2019-08-25 16:44:39 +02:00 |
|
Laurent Destailleur
|
69b2d03c47
|
FIX Api of documents work with value 'thirdparty'
|
2019-08-25 16:41:59 +02:00 |
|
Laurent Destailleur
|
3339f89fc5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
|
2019-08-22 12:45:23 +02:00 |
|
Laurent Destailleur
|
27cd6cd308
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
|
2019-08-22 12:39:07 +02:00 |
|
Laurent Destailleur
|
cdda08c0d3
|
FIX #11685
|
2019-08-22 11:47:03 +02:00 |
|
Laurent Destailleur
|
923eb935eb
|
Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card"
|
2019-08-22 11:28:49 +02:00 |
|
Laurent Destailleur
|
2bc0163354
|
Merge pull request #11685 from ptibogxiv/patch-224
FIX for MAIN_MAXTABS_IN_CARD = $i card
|
2019-08-22 11:25:08 +02:00 |
|
Regis Houssin
|
90f60b0137
|
FIX add $context parameter in checkLoginPassEntity
|
2019-08-22 10:56:07 +02:00 |
|
Laurent Destailleur
|
b06dab6930
|
Fix add option to restore backward compatibility
|
2019-08-22 00:44:28 +02:00 |
|
Laurent Destailleur
|
bfbabbf626
|
Update geoip v1
|
2019-08-21 18:26:41 +02:00 |
|
Laurent Destailleur
|
689aa4979e
|
Code comment
|
2019-08-21 17:28:54 +02:00 |
|
Laurent Destailleur
|
2c3b2cd1a0
|
Look and feel
|
2019-08-21 04:21:43 +02:00 |
|
Laurent Destailleur
|
c60fc6c3d4
|
Add param logcontext on dol_syslog
|
2019-08-20 13:57:25 +02:00 |
|
Laurent Destailleur
|
d304749eca
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-19 10:19:14 +02:00 |
|
Laurent Destailleur
|
cc3fd0f1f6
|
Merge pull request #11679 from atm-john/develop_new_task_progress_bar
FIX/NEW task widget and add task progress bar
|
2019-08-19 10:05:16 +02:00 |
|
Laurent Destailleur
|
18886c701d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/lib/company.lib.php
|
2019-08-19 00:02:26 +02:00 |
|
Laurent Destailleur
|
3a0057f6a3
|
FIX too many record in sql request. Whena criteria is a filter, we must
use an inner join.
|
2019-08-18 23:59:24 +02:00 |
|
Laurent Destailleur
|
4fd68798a3
|
Fix phpcs
|
2019-08-18 20:38:51 +02:00 |
|
Laurent Destailleur
|
2f46b40da2
|
Prepare feature "Never show this message again"
|
2019-08-18 18:36:18 +02:00 |
|
Laurent Destailleur
|
7e4cf224ec
|
Merge branch 'develop' into develop_new_task_progress_bar
|
2019-08-18 05:38:45 +02:00 |
|
Laurent Destailleur
|
3f105a97bf
|
Debug the new workboard
|
2019-08-18 04:56:48 +02:00 |
|
Laurent Destailleur
|
b8e1cc8d16
|
Enhance #11643
|
2019-08-18 03:42:38 +02:00 |
|
Laurent Destailleur
|
467ad3ed22
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/files.lib.php
htdocs/product/stock/card.php
|
2019-08-16 21:48:46 +02:00 |
|
Laurent Destailleur
|
898996da4a
|
FIX vulenrability in uploading file found by 美创科技安全实验室
|
2019-08-16 21:45:13 +02:00 |
|
Laurent Destailleur
|
d51a651ab4
|
Fix phpcs
|
2019-08-16 17:35:12 +02:00 |
|
Laurent Destailleur
|
1f2eb31e41
|
Set utf-8 in lowercase
|
2019-08-16 06:06:36 +02:00 |
|
Laurent Destailleur
|
318b27e084
|
Fix link
|
2019-08-16 05:33:45 +02:00 |
|
Laurent Destailleur
|
63520e1d9b
|
Fix link
|
2019-08-16 05:32:24 +02:00 |
|
Laurent Destailleur
|
62438b61f0
|
Better error message
|
2019-08-16 05:14:20 +02:00 |
|
Laurent Destailleur
|
9a455cf1d6
|
Fix link
|
2019-08-16 05:03:48 +02:00 |
|
Laurent Destailleur
|
d5ce7fbaaf
|
Fix links
|
2019-08-16 05:01:54 +02:00 |
|
Laurent Destailleur
|
7580efbd4e
|
Fix link replacement
|
2019-08-16 04:32:06 +02:00 |
|
Laurent Destailleur
|
2510c1e5e4
|
Better help text
|
2019-08-16 03:05:55 +02:00 |
|
Laurent Destailleur
|
08038e5078
|
FIX save of empty files
|
2019-08-16 02:31:06 +02:00 |
|
Laurent Destailleur
|
31c26edaf7
|
Fix link
|
2019-08-16 00:31:55 +02:00 |
|
Laurent Destailleur
|
0045428c6c
|
Fix link
|
2019-08-15 23:45:28 +02:00 |
|
Laurent Destailleur
|
6430c74793
|
Merge pull request #11168 from hregis/develop_menu
NEW add new function "setEntity()" and better compatibility with Multicompany
|
2019-08-15 21:00:05 +02:00 |
|
Laurent Destailleur
|
c0ac8daa61
|
Introduce the color theme "flashy" to use the high contrast color as an
option because colors seems too agressive for sensible eyes.
|
2019-08-15 20:18:12 +02:00 |
|
Laurent Destailleur
|
76ae2695b2
|
Merge pull request #11690 from OPEN-DSI/new-expedition-list-massaction
NEW add mass actions and FIX type ent array not defined in shipment list
|
2019-08-15 19:14:34 +02:00 |
|
Laurent Destailleur
|
1c372251de
|
Merge pull request #11691 from jtraulle/feature-rest-api-supplierinvoices-payments
NEW Add GET and POST /supplierinvoices/payments REST API endpoints.
|
2019-08-15 19:13:32 +02:00 |
|
Laurent Destailleur
|
9cb5ba35dd
|
Merge pull request #11681 from hregis/10.0_mc
FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme
|
2019-08-15 19:08:42 +02:00 |
|
Laurent Destailleur
|
59625dceb5
|
Fix phpcs
|
2019-08-15 19:03:30 +02:00 |
|
Laurent Destailleur
|
b5d72edebc
|
Can add more samples of pages. Add an exemple of page with dynamic
content.
|
2019-08-15 18:07:36 +02:00 |
|
Laurent Destailleur
|
c92488986b
|
NEW Can have a preview of website template when loading a template
|
2019-08-15 02:32:07 +02:00 |
|
Laurent Destailleur
|
ca256a6635
|
Add shadow style
|
2019-08-15 01:58:22 +02:00 |
|
Laurent Destailleur
|
f81463af0c
|
Update templates
|
2019-08-15 00:55:47 +02:00 |
|
Jean Traullé
|
4252a2c868
|
Merge branch 'develop' into feature-rest-api-supplierinvoices-payments
|
2019-08-14 23:35:35 +02:00 |
|
Jean Traullé
|
c739b95666
|
Fix codestyle
lessc.class.php should be excluded from ruleset as it is an external lib
|
2019-08-14 23:33:06 +02:00 |
|
Laurent Destailleur
|
f753799810
|
FIX Support #tag into url of website module
|
2019-08-14 23:27:34 +02:00 |
|
Jean Traullé
|
6d55af2530
|
Merge remote-tracking branch 'remotes/upstream/develop' into feature-rest-api-supplierinvoices-payments
|
2019-08-14 23:24:15 +02:00 |
|
Jean Traullé
|
1d2c2f8551
|
NEW Add payments GET and POST REST API endpoints for supplierinvoices.
|
2019-08-14 23:00:40 +02:00 |
|
Laurent Destailleur
|
0818571827
|
Work on the edit inline tool.
|
2019-08-14 19:48:52 +02:00 |
|
VESSILLER
|
b19817194d
|
NEW add mass actions and FIX type ent array not defined in shipment list
|
2019-08-14 17:11:59 +02:00 |
|
VESSILLER
|
891cd155ea
|
NEW add mass actions and FIX type ent array not defined in shipment list
|
2019-08-14 17:04:13 +02:00 |
|
Laurent Destailleur
|
10a3e773ce
|
FIX Avoid to add new line in css file at each save
|
2019-08-14 16:28:41 +02:00 |
|
Laurent Destailleur
|
12bebdefbb
|
Fix can replace PclZip with ZipArchive
|
2019-08-14 04:07:25 +02:00 |
|
Laurent Destailleur
|
fbf6cbe091
|
FIX Option to use ZipArchive instead of PclZip bugged with large files.
|
2019-08-14 04:07:02 +02:00 |
|
Laurent Destailleur
|
6de2118f11
|
FIX Bad error management in zip compress and web site export
Conflicts:
htdocs/website/index.php
|
2019-08-14 04:06:29 +02:00 |
|
Laurent Destailleur
|
e1ab5089d7
|
FIX Missing some replacements in website module
Conflicts:
htdocs/website/index.php
|
2019-08-14 04:02:57 +02:00 |
|
Laurent Destailleur
|
f1c6f1b375
|
Fix can replace PclZip with ZipArchive
|
2019-08-14 04:00:08 +02:00 |
|
Laurent Destailleur
|
b0172f136b
|
FIX Option to use ZipArchive instead of PclZip bugged with large files.
|
2019-08-14 03:43:15 +02:00 |
|
Laurent Destailleur
|
bc230c2d25
|
FIX Bad error management in zip compress and web site export
|
2019-08-14 01:43:06 +02:00 |
|
Laurent Destailleur
|
df53826426
|
FIX Missing some replacements in website module
|
2019-08-13 18:22:18 +02:00 |
|
ptibogxiv
|
93d64bb84e
|
Update functions.lib.php
|
2019-08-13 17:59:19 +02:00 |
|
ptibogxiv
|
8198276d64
|
FIX for MAIN_MAXTABS_IN_CARD = $i card
|
2019-08-13 17:47:30 +02:00 |
|
Regis Houssin
|
34579dd4db
|
FIX phpcs
|
2019-08-13 07:46:03 +02:00 |
|
Regis Houssin
|
7c8b3c9a38
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-08-13 07:34:02 +02:00 |
|
Laurent Destailleur
|
49e61e237c
|
Better log
|
2019-08-13 07:08:45 +02:00 |
|
Laurent Destailleur
|
91cdb2a5a8
|
Add more logs
|
2019-08-13 07:05:06 +02:00 |
|
Laurent Destailleur
|
7891c8d856
|
Enhance logs
|
2019-08-13 06:52:07 +02:00 |
|
Laurent Destailleur
|
99473097a9
|
FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks
Conflicts:
htdocs/website/index.php
|
2019-08-13 06:43:28 +02:00 |
|
Laurent Destailleur
|
277a693c16
|
FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks
|
2019-08-13 06:37:06 +02:00 |
|
Laurent Destailleur
|
ae4bead85c
|
Fix missing function
|
2019-08-13 04:43:50 +02:00 |
|
Laurent Destailleur
|
7824731f17
|
NEW Add feature to search a string into containers
|
2019-08-13 00:34:42 +02:00 |
|
ATM john
|
b193f1b34e
|
Fix travis
|
2019-08-12 23:33:00 +02:00 |
|
Lenin Rivas
|
5c1a84746c
|
Add Linked objects Fichinter Ref. in PDF formats
|
2019-08-12 15:21:41 -05:00 |
|
Laurent Destailleur
|
8ad2081555
|
NEW Can select website templates from available default templates
|
2019-08-12 22:19:24 +02:00 |
|
Laurent Destailleur
|
c986dbc71f
|
NEW Add search into template
|
2019-08-12 20:32:18 +02:00 |
|
Laurent Destailleur
|
de1af78ae6
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-12 17:38:54 +02:00 |
|
Laurent Destailleur
|
18e4d1b334
|
Fix to avoid to die page when there is a redirect.
|
2019-08-12 17:22:46 +02:00 |
|
ATM john
|
1ffb013371
|
add filter
|
2019-08-12 15:24:07 +02:00 |
|
Laurent Destailleur
|
446f0590dc
|
FIX VAT number for Monaco (it uses FR)
|
2019-08-12 13:45:04 +02:00 |
|
ATM john
|
53721ae606
|
move late warning sign
|
2019-08-10 23:09:27 +02:00 |
|
ATM john
|
89447acaf3
|
remove tooltip on progress bar
|
2019-08-10 23:07:12 +02:00 |
|
ATM john
|
eedd065f48
|
remove useless function usage
|
2019-08-10 22:59:09 +02:00 |
|
ATM john
|
09c1289802
|
Fix task widget and improve its display
|
2019-08-10 22:48:07 +02:00 |
|
ATM john
|
527e4dcf46
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar
|
2019-08-10 15:41:49 +02:00 |
|
ATM john
|
3f0f7e2ad5
|
Add progress bar for task list and visual status badges
|
2019-08-10 15:41:21 +02:00 |
|
John Botella
|
63191dab7d
|
Add user color blind option
|
2019-08-07 12:03:19 +02:00 |
|
John Botella
|
4aeaa580ea
|
Add color blind option
|
2019-08-07 11:11:47 +02:00 |
|
Laurent Destailleur
|
c34739ab3f
|
Fix A file for a hidden feature provides a service without security
checks.
|
2019-08-02 19:25:50 +02:00 |
|
Laurent Destailleur
|
b9ee95314a
|
SEC restrictedArea protects also the 'update' action
|
2019-08-02 17:12:59 +02:00 |
|
Laurent Destailleur
|
89a5a8188f
|
Fix A file for a hidden feature provides a service without security
checks.
|
2019-08-02 17:12:03 +02:00 |
|
Laurent Destailleur
|
a03771ce61
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 16:30:40 +02:00 |
|
Laurent Destailleur
|
3d8f6dca76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-08-01 16:30:32 +02:00 |
|
Laurent Destailleur
|
bf14b4b3d5
|
Add Canada Dollar in currency that need symbol before
|
2019-08-01 16:20:18 +02:00 |
|
Laurent Destailleur
|
24bfd9d98b
|
Merge pull request #11605 from grandoc/new_branch_01_08_2019
add CAN$ within list of currencies before
|
2019-08-01 16:18:37 +02:00 |
|
Laurent Destailleur
|
73715f00af
|
Update functions.lib.php
|
2019-08-01 16:18:26 +02:00 |
|
Laurent Destailleur
|
008a54ea19
|
Update functions.lib.php
|
2019-08-01 16:14:53 +02:00 |
|
dolibarr95
|
b066431e0e
|
Add phone format for Jamaica
|
2019-08-01 15:46:34 +02:00 |
|
Laurent Destailleur
|
d6ae62478c
|
FIX #10984 FIX reposition on "Build backup" button
FIX Fatal error on dol_htmloutput_mesg with corrupted array
|
2019-08-01 15:42:44 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
Laurent Destailleur
|
12b530c418
|
FIX Setup of TakePos was not possible after a clean install
|
2019-08-01 11:27:35 +02:00 |
|
Philippe GRAND
|
4b8963587a
|
add CAN$ within list of currencies before
|
2019-08-01 10:02:53 +02:00 |
|
Regis Houssin
|
d9ea61e47c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
|
2019-07-31 12:49:56 +02:00 |
|
Laurent Destailleur
|
a7390e7e47
|
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
NEW Management of retained warranty on situation invoices
|
2019-07-30 21:53:09 +02:00 |
|
Laurent Destailleur
|
1f3e509603
|
Show message when a redirect is done.
|
2019-07-28 21:24:42 +02:00 |
|
Laurent Destailleur
|
a46bfc7a29
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2019-07-25 17:54:14 +02:00 |
|
Laurent Destailleur
|
4a8377e4fd
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-07-25 17:52:40 +02:00 |
|
Laurent Destailleur
|
8241bc414a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2019-07-25 17:52:17 +02:00 |
|
Laurent Destailleur
|
fe9ddd7649
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2019-07-25 17:50:07 +02:00 |
|
Laurent Destailleur
|
fe22f11f10
|
More generic code
|
2019-07-25 15:07:00 +02:00 |
|
Laurent Destailleur
|
351b877c05
|
Add structured data product
|
2019-07-25 14:39:22 +02:00 |
|
Laurent Destailleur
|
fb2a9e371c
|
Fix syntax
|
2019-07-25 14:27:53 +02:00 |
|
Laurent Destailleur
|
6674b8975b
|
Fix logo of organization
|
2019-07-25 14:26:48 +02:00 |
|
Laurent Destailleur
|
1978ffb370
|
Fix
|
2019-07-25 14:21:39 +02:00 |
|
Laurent Destailleur
|
e29023f155
|
Fix
|
2019-07-25 14:12:22 +02:00 |
|
Laurent Destailleur
|
5fd35c1bc9
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/website.lib.php
|
2019-07-25 13:51:12 +02:00 |
|
Laurent Destailleur
|
d1aa15004e
|
NEW Add method getStructuredData for website
|
2019-07-25 13:49:56 +02:00 |
|
Laurent Destailleur
|
0bb92ff10d
|
NEW Add method getStructuredDataForBlogPost for website
|
2019-07-25 13:48:13 +02:00 |
|
Laurent Destailleur
|
151075402f
|
css
|
2019-07-24 17:15:25 +02:00 |
|
atm-josselin
|
0a1f4b7931
|
FIX : correct error in files with multiple spaces
|
2019-07-23 09:45:17 +02:00 |
|
Laurent Destailleur
|
bf55733678
|
NEW Replace the "info" tab on contract with the more complete "agenda"
tag.
|
2019-07-23 02:45:31 +02:00 |
|
Laurent Destailleur
|
f5afc50067
|
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
|
2019-07-22 18:47:35 +02:00 |
|
Laurent Destailleur
|
de18d5d187
|
Enhance phpstan
|
2019-07-20 16:22:00 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Laurent Destailleur
|
20e58bdd97
|
FIX Limit of uploaded files (max_post_size was not used)
|
2019-07-20 13:09:25 +02:00 |
|
Alexandre SPANGARO
|
8b8aaafc05
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-07-20 05:47:31 +02:00 |
|
Laurent Destailleur
|
220f8300c1
|
FIX Responsive of public interface of ticket
|
2019-07-20 00:14:14 +02:00 |
|
Alexandre SPANGARO
|
0af1206892
|
Merge branch 'develop' into 11.0_salaries
|
2019-07-19 23:11:06 +02:00 |
|
Alexandre SPANGARO
|
9ab0734415
|
NEW Extrafields on salaries
|
2019-07-19 23:08:24 +02:00 |
|
Laurent Destailleur
|
14751680d2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-19 13:38:05 +02:00 |
|
Regis Houssin
|
7ffc46e1da
|
FIX When we are in update mode, so we use $this->entity
|
2019-07-19 09:47:05 +02:00 |
|
Regis Houssin
|
cbda42d146
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-07-19 09:37:34 +02:00 |
|
Laurent Destailleur
|
6c3a30e872
|
Fix log
|
2019-07-19 03:05:55 +02:00 |
|
Laurent Destailleur
|
b9fe874b5f
|
Revert "Merge pull request #11022 from altatof/freetext"
This reverts commit 879b4d8e7f, reversing
changes made to ddc01b4c27.
|
2019-07-18 18:19:51 +02:00 |
|
Laurent Destailleur
|
879b4d8e7f
|
Merge pull request #11022 from altatof/freetext
NEW : manage output languages for free text
|
2019-07-18 17:29:45 +02:00 |
|
Alexandre SPANGARO
|
21bd46fc15
|
Merge remote-tracking branch 'upstream/develop' into 11.0_salaries
|
2019-07-17 14:09:46 +02:00 |
|
Alexandre SPANGARO
|
79d8351dda
|
NEW Extrafields on salaries
|
2019-07-17 14:09:25 +02:00 |
|
Laurent Destailleur
|
ee109ac568
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-05 17:44:50 +02:00 |
|
Laurent Destailleur
|
9b32763919
|
Fix label for report n ledger for transitionnal bank account on tranfer
|
2019-07-05 15:25:29 +02:00 |
|
Laurent Destailleur
|
e3359c6f0f
|
FIX Can't submit a ticket from public interface
|
2019-07-05 11:21:04 +02:00 |
|
Laurent Destailleur
|
4e00cfb455
|
Clean code
|
2019-07-04 16:02:04 +02:00 |
|
Laurent Destailleur
|
fb8c93a69d
|
FIX Bad sql request
|
2019-07-04 16:00:14 +02:00 |
|
Laurent Destailleur
|
c9477f5c4f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2019-07-01 13:29:33 +02:00 |
|
John Botella
|
9c2e83dcae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-07-01 09:51:26 +02:00 |
|
Laurent Destailleur
|
8f5b575b19
|
Fix missing php-intl is not blocking (not working on windows)
|
2019-06-30 16:19:26 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Alexandre SPANGARO
|
8f0f8f74f7
|
WIP
|
2019-06-26 17:13:38 +02:00 |
|
atm-quentin
|
49db277368
|
FIX ending slash
|
2019-06-26 16:42:14 +02:00 |
|
Alexandre SPANGARO
|
9da91c06ed
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-26 15:11:43 +02:00 |
|
John Botella
|
7e14a598e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-26 09:43:43 +02:00 |
|
Laurent Destailleur
|
a7bd734ece
|
Rename ->produit into ->product. Still permissions to rename.
|
2019-06-24 21:18:49 +02:00 |
|
Laurent Destailleur
|
d1dc189a8f
|
Merge pull request #11383 from atm-maxime/new_task_totaldeclared
NEW Add global task declared progression
|
2019-06-24 18:12:55 +02:00 |
|
Laurent Destailleur
|
3c4956838e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
|
2019-06-24 15:44:44 +02:00 |
|
John Botella
|
ec7446762c
|
Fix travis
|
2019-06-24 14:36:06 +02:00 |
|
Laurent Destailleur
|
76d49229cd
|
Fix log
|
2019-06-24 13:42:46 +02:00 |
|
Laurent Destailleur
|
1c86294f83
|
Enhance pdf_getFormat
|
2019-06-24 13:39:32 +02:00 |
|
Laurent Destailleur
|
1699413a4c
|
Add log
|
2019-06-24 12:59:16 +02:00 |
|
John Botella
|
9c414a7a57
|
Change function to camel case
|
2019-06-24 12:22:33 +02:00 |
|
John Botella
|
a83e7f3665
|
Add retained warranty to PDF
|
2019-06-24 12:00:55 +02:00 |
|
John Botella
|
7b6925b8f7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-24 10:29:43 +02:00 |
|
Alexandre SPANGARO
|
4a84dcaa62
|
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
|
2019-06-23 21:47:34 +02:00 |
|
Laurent Destailleur
|
6cab4f03ba
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-22 12:10:50 +02:00 |
|
Laurent Destailleur
|
a4cd7772ef
|
Fix title
|
2019-06-22 12:02:41 +02:00 |
|
John Botella
|
ec7ebe9f39
|
redo backported fix and update adherent substitution methode
|
2019-06-21 15:32:38 +02:00 |
|
John Botella
|
200b66d11f
|
Remove a backported fix because failling at init test
|
2019-06-21 14:52:12 +02:00 |
|
Laurent Destailleur
|
8da5794777
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
|
2019-06-20 18:24:43 +02:00 |
|
Maxime Kohlhaas
|
b0229d1b9a
|
Global task declared progression on project task tab
|
2019-06-20 14:07:44 +02:00 |
|
Laurent Destailleur
|
ff0f6295d8
|
Fix phpcs
|
2019-06-20 13:59:53 +02:00 |
|
Laurent Destailleur
|
6975e18233
|
Fix phpcs
|
2019-06-20 13:59:04 +02:00 |
|
Laurent Destailleur
|
4ffa48d9bd
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 13:50:47 +02:00 |
|
Laurent Destailleur
|
29e3199639
|
Fix phpcs
|
2019-06-20 13:39:29 +02:00 |
|
Laurent Destailleur
|
e9da44e023
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 12:33:02 +02:00 |
|
Laurent Destailleur
|
cb057e9c6d
|
NEW Add hidden option to be ready for BREXIT
|
2019-06-20 12:32:14 +02:00 |
|
John Botella
|
b21006614c
|
Fix substitutions null
|
2019-06-20 12:00:44 +02:00 |
|
Laurent Destailleur
|
a264a4766a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-20 03:45:04 +02:00 |
|
Laurent Destailleur
|
ee8e7d66f8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-06-20 03:43:27 +02:00 |
|
Laurent Destailleur
|
078324811b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2019-06-20 03:43:16 +02:00 |
|
Laurent Destailleur
|
4574ad2eeb
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
|
2019-06-20 03:39:48 +02:00 |
|
Laurent Destailleur
|
554724a46f
|
Merge pull request #11363 from aspangaro/10.0_other
Translate rights
|
2019-06-20 03:36:16 +02:00 |
|
Laurent Destailleur
|
03178bc481
|
Merge pull request #11293 from hregis/develop_pdf
FIX better method to check if pdf is protected/encrypted
|
2019-06-20 03:22:51 +02:00 |
|
Laurent Destailleur
|
d152354022
|
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield
NEW add extrafields in warehouses
|
2019-06-20 03:16:49 +02:00 |
|
Laurent Destailleur
|
898d766489
|
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
Allow zero as account number
|
2019-06-20 03:09:37 +02:00 |
|
Laurent Destailleur
|
d6b6f77e74
|
Fix support domains with 3 levels
|
2019-06-19 22:06:12 +02:00 |
|
Laurent Destailleur
|
68e9712f0c
|
Fix support domains with 3 levels
|
2019-06-19 22:05:38 +02:00 |
|
Alexandre SPANGARO
|
abfb708044
|
Merge branch 'develop' into 10.0_intracommreport
|
2019-06-19 21:43:40 +02:00 |
|
Alexandre SPANGARO
|
c59de49894
|
Translate rights
|
2019-06-18 22:38:52 +02:00 |
|
Laurent Destailleur
|
20e00ca290
|
FIX if last char of customercode is accent making the truncate of first
chars wrong.
|
2019-06-18 19:41:16 +02:00 |
|
Laurent Destailleur
|
42e58d9ea5
|
Fix preview of interventions
|
2019-06-17 18:38:14 +02:00 |
|
Eric Seigne
|
80d4d8754d
|
allow zero as accountancy code nomber (replace all empty tests by != '')
|
2019-06-17 18:28:11 +02:00 |
|
Regis Houssin
|
3afd4e15ad
|
FIX try to remove ob_* functions
|
2019-06-17 07:09:19 +02:00 |
|
Regis Houssin
|
908b5fff00
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf
|
2019-06-17 07:08:35 +02:00 |
|
Regis Houssin
|
6597c9f60d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-17 06:45:08 +02:00 |
|
Laurent Destailleur
|
122c4eb8bd
|
Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction
FIX empty test
|
2019-06-14 13:51:34 +02:00 |
|
Laurent Destailleur
|
1fa1b91916
|
Update product.lib.php
|
2019-06-14 13:46:59 +02:00 |
|
Laurent Destailleur
|
e6c28188db
|
Update product.lib.php
|
2019-06-14 13:38:52 +02:00 |
|
ATM john
|
e7d81a68f0
|
Fix Override Attribute
|
2019-06-13 22:11:47 +02:00 |
|
ATM john
|
0ef9a8843a
|
Fix empty test
|
2019-06-13 21:57:30 +02:00 |
|
ptibogxiv
|
a30f029bbf
|
Update product.lib.php
|
2019-06-13 20:53:24 +02:00 |
|
ptibogxiv
|
b13b089c58
|
Fix measuring_units_string display function
|
2019-06-13 20:52:52 +02:00 |
|
Laurent Destailleur
|
f00c9a10db
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
|
2019-06-13 12:15:51 +02:00 |
|
Laurent Destailleur
|
900e860f6d
|
Fix list of events for BOM module
|
2019-06-12 19:32:29 +02:00 |
|
Laurent Destailleur
|
2be5e9615d
|
Fix look and field v10
|
2019-06-12 19:03:22 +02:00 |
|
Laurent Destailleur
|
e81663ec34
|
Fix cropping of image files for BOM module was ko
|
2019-06-12 19:00:34 +02:00 |
|
Laurent Destailleur
|
f6d8b46b40
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
|
2019-06-07 22:58:58 +02:00 |
|
Laurent Destailleur
|
0a903da5dc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/card.php
htdocs/fichinter/card.php
|
2019-06-07 22:53:30 +02:00 |
|
Laurent Destailleur
|
b73d287953
|
Update agenda.lib.php
|
2019-06-07 18:09:43 +02:00 |
|
Frédéric FRANCE
|
f11db8396a
|
Parameter must be array or object that implements Countable
warning with php 7.2
|
2019-06-06 09:49:32 +02:00 |
|
Laurent Destailleur
|
a08dcec7fc
|
Fix doc
|
2019-06-04 20:02:29 +02:00 |
|
Laurent Destailleur
|
210b2f37dc
|
Fix error message
|
2019-06-04 19:18:20 +02:00 |
|
John BOTELLA
|
d7a393bbd3
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
|
2019-06-04 14:00:18 +02:00 |
|
Laurent Destailleur
|
79a3e41418
|
Hook 'getAccessForbiddenMessage'
|
2019-06-04 12:48:06 +02:00 |
|
Lionel VESSILLER
|
490e85f494
|
Fix PSR2
|
2019-06-03 16:34:49 +02:00 |
|
Lionel VESSILLER
|
439eafb637
|
NEW add extrafields in warehouses
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
|
2019-06-03 15:44:17 +02:00 |
|
Regis Houssin
|
e5e6111544
|
FIX wrong function name
|
2019-06-03 12:05:58 +02:00 |
|
Regis Houssin
|
b0042995ac
|
FIX add docs
|
2019-06-03 12:04:17 +02:00 |
|
Regis Houssin
|
38246b4088
|
NEW add new function "setEntity()"
|
2019-06-03 11:13:26 +02:00 |
|
Regis Houssin
|
7b8b1a9052
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-03 11:04:28 +02:00 |
|
Regis Houssin
|
43ada3fcd4
|
FIX better method to check if pdf is protected/encrypted
|
2019-06-03 09:36:00 +02:00 |
|
Laurent Destailleur
|
5530e003ba
|
Fix title
|
2019-06-02 19:47:19 +02:00 |
|
Laurent Destailleur
|
e6100310af
|
Fix missing title
|
2019-06-02 19:47:01 +02:00 |
|
Laurent Destailleur
|
ab73d8a6fc
|
Merge pull request #11258 from hregis/develop_security
FIX add Windows and Mac executable
|
2019-05-29 13:52:19 +02:00 |
|
Laurent Destailleur
|
05063016e8
|
FIX #11244 Enhance repair tool
|
2019-05-29 12:21:51 +02:00 |
|
Laurent Destailleur
|
a524fd17ce
|
Fix phpcs
|
2019-05-29 10:03:05 +02:00 |
|
Laurent Destailleur
|
3841fb5a85
|
Fix doxygen
|
2019-05-28 22:18:46 +02:00 |
|
Laurent Destailleur
|
454316a5fa
|
Fix getDomainFromURL
|
2019-05-28 22:18:22 +02:00 |
|
Laurent Destailleur
|
2404e6a521
|
Fix cast to int
|
2019-05-28 12:38:21 +02:00 |
|
Regis Houssin
|
3df6f0f6c3
|
FIX wrong extension
|
2019-05-27 11:43:06 +02:00 |
|
Regis Houssin
|
c1242f409b
|
FIX add Windows and Mac executable
|
2019-05-27 11:32:46 +02:00 |
|
Laurent Destailleur
|
c8970c0283
|
Fix vat validator
|
2019-05-22 16:50:53 +02:00 |
|
Laurent Destailleur
|
fb95fe0606
|
Check vat is not case sensitive
|
2019-05-22 16:15:26 +02:00 |
|
Laurent Destailleur
|
65acd6ef60
|
Fix function to check vat syntax
|
2019-05-22 15:48:07 +02:00 |
|
Laurent Destailleur
|
11bcfb4f5e
|
Fix check on VAT syntax not visible on list
|
2019-05-22 15:37:59 +02:00 |
|
Regis Houssin
|
4f2f23f522
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-22 08:45:31 +02:00 |
|
Laurent Destailleur
|
42f5ebed2d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/external_rss.php
htdocs/admin/system/database-tables.php
htdocs/admin/tools/export_files.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/files.lib.php
htdocs/core/lib/functions.lib.php
|
2019-05-21 15:13:25 +02:00 |
|
Laurent Destailleur
|
f283e24b48
|
Fix the noexe must be added for dangerous extension like js and shells
|
2019-05-21 13:53:12 +02:00 |
|
Laurent Destailleur
|
eafc35b00f
|
Look and feel v10
|
2019-05-21 13:27:45 +02:00 |
|
Regis Houssin
|
2cf630c213
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-20 16:10:47 +02:00 |
|
Alexandre SPANGARO
|
f9e3a958c4
|
NEW Module Intracomm report
|
2019-05-19 10:44:09 +02:00 |
|
Laurent Destailleur
|
2bbb04085e
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
|
2019-05-19 02:15:01 +02:00 |
|
Laurent Destailleur
|
71ef8c881b
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/modulebuilder/template/class/myobject.class.php
|
2019-05-19 02:06:20 +02:00 |
|
Laurent Destailleur
|
7738787729
|
Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0
Conflicts:
htdocs/core/actions_sendmails.inc.php
|
2019-05-19 02:03:16 +02:00 |
|
Maxime Kohlhaas
|
1d980342ec
|
Fix #8344
|
2019-05-19 00:05:23 +02:00 |
|
Laurent Destailleur
|
41cb13b1cc
|
Fix warning
|
2019-05-18 19:28:14 +02:00 |
|
Laurent Destailleur
|
4517d84e3a
|
FIX Disable a module
|
2019-05-18 19:22:17 +02:00 |
|
Laurent Destailleur
|
94f5f6c655
|
Merge pull request #11207 from atm-john/FIX_scrutyniser
FIX: scrutinizer feedback
|
2019-05-18 16:05:24 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
ATM John BOTELLA
|
f714b45efb
|
FIX scrutinizer feedback
|
2019-05-18 15:53:07 +02:00 |
|
Laurent Destailleur
|
26d4875f8f
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-05-18 02:27:23 +02:00 |
|
Laurent Destailleur
|
6c4a4c34c4
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
|
2019-05-18 02:26:40 +02:00 |
|
Maxime Kohlhaas
|
2a2f0557cf
|
Fix : display hr tab on user if rights to read all
|
2019-05-17 17:07:38 +02:00 |
|
Laurent Destailleur
|
2d0b3b7b23
|
Fix dol_sort_array for objects
|
2019-05-16 12:25:14 +02:00 |
|
Laurent Destailleur
|
4a69541419
|
Several bug fixes using phpstan
|
2019-05-15 18:59:46 +02:00 |
|
Laurent Destailleur
|
717cafe213
|
Fix doc
|
2019-05-15 17:50:35 +02:00 |
|
Laurent Destailleur
|
75646e365d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contrat/list.php
htdocs/contrat/services_list.php
htdocs/expensereport/list.php
htdocs/product/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/projet/list.php
|
2019-05-13 12:28:16 +02:00 |
|
Laurent Destailleur
|
9242c1a630
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
ChangeLog
htdocs/contrat/services_list.php
htdocs/core/lib/files.lib.php
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2019-05-13 12:22:14 +02:00 |
|
Laurent Destailleur
|
c67d79a4e2
|
Update files.lib.php
|
2019-05-13 12:00:13 +02:00 |
|
Regis Houssin
|
b73df2698d
|
FIX better compatibility with Multicompany
|
2019-05-12 14:25:41 +02:00 |
|
Laurent Destailleur
|
1c3bcea1f9
|
Merge pull request #11157 from ptibogxiv/patch-180
Fix img_credit_card with payment methods
|
2019-05-10 16:28:52 +02:00 |
|
Laurent Destailleur
|
cd8f601cdc
|
Fix length of vat number
|
2019-05-10 14:01:11 +02:00 |
|
ptibogxiv
|
f50280f13b
|
Fix img_credit_card with payment methods
|
2019-05-10 01:16:58 +02:00 |
|
Laurent Destailleur
|
314dc26b87
|
Look and feel v10
|
2019-05-09 19:32:19 +02:00 |
|
Laurent Destailleur
|
a5b1de4f6a
|
Fix tab that should not be visible
|
2019-05-09 17:52:55 +02:00 |
|
Laurent Destailleur
|
84714f39e2
|
Fix setup of terminal
|
2019-05-09 13:37:20 +02:00 |
|
Laurent Destailleur
|
96c021773e
|
Update takepos.lib.php
|
2019-05-08 19:11:17 +02:00 |
|
andreubisquerra
|
84cfa00bf1
|
Terminals
|
2019-05-08 18:29:00 +02:00 |
|
gauthier
|
f661b926fa
|
FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf
Example : if you upload a file like "my file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
|
2019-05-07 14:33:17 +02:00 |
|
Laurent Destailleur
|
eab49d4300
|
NEW Update Stripe library to 6.34.3
|
2019-05-03 02:22:27 +02:00 |
|
Laurent Destailleur
|
8442c86436
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
|
2019-05-02 17:40:41 +02:00 |
|
Laurent Destailleur
|
8d7f24a6d9
|
FIX Default value on form to send email
|
2019-05-02 15:34:29 +02:00 |
|
Laurent Destailleur
|
425dd6faf7
|
Merge branch 'develop' into patch-2
|
2019-05-02 12:38:38 +02:00 |
|
Laurent Destailleur
|
ceeb9752ce
|
Fix PHPCS
|
2019-05-02 12:28:40 +02:00 |
|
Laurent Destailleur
|
0f8c7df6fe
|
Debug api of module BOM
|
2019-05-02 12:19:43 +02:00 |
|
Laurent Destailleur
|
90a1181dc5
|
Debug module Ticket
|
2019-05-01 20:41:03 +02:00 |
|
Laurent Destailleur
|
a75c6a81d1
|
FIX Follow rule to create a new page
|
2019-05-01 17:15:42 +02:00 |
|
Frédéric FRANCE
|
ac304f58b0
|
clean new commits
|
2019-04-30 20:37:59 +02:00 |
|
Frédéric FRANCE
|
5766bb0b8a
|
Merge remote-tracking branch 'upstream/develop' into patch-2
|
2019-04-30 20:16:43 +02:00 |
|
Laurent Destailleur
|
61bf731d17
|
FIX Balance of td
|
2019-04-30 18:11:35 +02:00 |
|
Frédéric FRANCE
|
3e99a40b9e
|
Update website.lib.php
|
2019-04-26 17:47:47 +02:00 |
|
Laurent Destailleur
|
4bd732cc40
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
|
2019-04-25 23:25:21 +02:00 |
|
Laurent Destailleur
|
63c0ab93fb
|
FIX CVE-2019-11201
|
2019-04-25 23:21:25 +02:00 |
|
Laurent Destailleur
|
10dde837d0
|
Debug email collector
|
2019-04-25 19:32:48 +02:00 |
|
Laurent Destailleur
|
6fe84a7962
|
Fix phpcs
|
2019-04-25 11:18:25 +02:00 |
|
Laurent Destailleur
|
68d438b697
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/user/class/user.class.php
|
2019-04-25 01:50:48 +02:00 |
|
Laurent Destailleur
|
560b026d68
|
Fix CSS
|
2019-04-25 01:26:29 +02:00 |
|
Laurent Destailleur
|
79c37f2226
|
Fix link for endpoint
|
2019-04-24 18:47:11 +02:00 |
|
Laurent Destailleur
|
684e09fdcd
|
NEW Add function isValidVATID()
|
2019-04-23 22:49:33 +02:00 |
|
Laurent Destailleur
|
4d92d7731c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
|
2019-04-23 12:32:08 +02:00 |
|
Laurent Destailleur
|
8d0825910a
|
Fix warnings
|
2019-04-23 10:38:20 +02:00 |
|
Laurent Destailleur
|
7c7c4f0d93
|
Removed warnings
|
2019-04-23 10:24:16 +02:00 |
|
Laurent Destailleur
|
f19d96bf8d
|
NEW Show enabled modules in dol_print_error
|
2019-04-23 10:24:05 +02:00 |
|
Laurent Destailleur
|
a50fc9189b
|
Fix phpcs
|
2019-04-22 15:45:44 +02:00 |
|
Laurent Destailleur
|
9e91826dea
|
Can set length of random password
|
2019-04-22 14:12:58 +02:00 |
|
Laurent Destailleur
|
be726c2376
|
Code comment
|
2019-04-22 12:44:25 +02:00 |
|
Laurent Destailleur
|
24572e2f82
|
Remove warnings
|
2019-04-22 12:42:46 +02:00 |
|
Laurent Destailleur
|
6da42941a8
|
NEW Add attached document on bank account visible in automatic ECM.
|
2019-04-21 19:54:30 +02:00 |
|
florian HENRY
|
83cf08f2eb
|
fix php warning
|
2019-04-18 20:37:27 +02:00 |
|
Frédéric FRANCE
|
4912c69d8a
|
Update functions2.lib.php
|
2019-04-18 10:12:00 +02:00 |
|
Laurent Destailleur
|
b5bf6830e9
|
Introduce method convertBackOfficeMediasLinksToPublicLinks so links to
media added from filemanager in notes are visible by PDFs builder.
|
2019-04-17 01:13:59 +02:00 |
|
ATM john
|
945e3db952
|
remove text
|
2019-04-16 22:03:11 +02:00 |
|
ATM john
|
965c973bda
|
Change class name
|
2019-04-16 22:02:23 +02:00 |
|
ATM john
|
684879d73c
|
apply appli btn to more elements
|
2019-04-16 21:49:26 +02:00 |
|
Christophe Battarel
|
ce4b67ecaa
|
fix pagefoot
|
2019-04-16 16:45:43 +02:00 |
|
Christophe Battarel
|
502b1e4d31
|
add lang management to freetext
|
2019-04-16 16:16:37 +02:00 |
|
John BOTELLA
|
a60d4b3b52
|
Appli btn apply to links
|
2019-04-16 09:09:25 +02:00 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
Laurent Destailleur
|
00eb0511f6
|
Make code simpler to sort list of files.
|
2019-04-13 12:41:50 +02:00 |
|
Laurent Destailleur
|
cf058e7d3b
|
NEW Ask date of invoice when using the Clone feature.
|
2019-04-12 12:12:08 +02:00 |
|
Laurent Destailleur
|
cfa414b2de
|
Better log
|
2019-04-10 16:42:45 +02:00 |
|
Laurent Destailleur
|
26594fab98
|
Debug module ticket
|
2019-04-10 15:11:38 +02:00 |
|
Laurent Destailleur
|
ac25003d33
|
Dolibarize module ticket
|
2019-04-10 11:39:54 +02:00 |
|
Laurent Destailleur
|
ff629b2355
|
NEW Color for hover and for checked line is on by default
|
2019-04-09 15:57:26 +02:00 |
|
Laurent Destailleur
|
917b9d69fa
|
Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
not recommanded to use in Dolibarr.
|
2019-04-08 14:55:31 +02:00 |
|
Laurent Destailleur
|
2b5e25188c
|
Merge pull request #10977 from IonAgorria/resources-product
NEW: Resources tab possible in products/services
|
2019-04-08 13:57:30 +02:00 |
|
Laurent Destailleur
|
7c91c1b9f1
|
Merge pull request #10962 from aspangaro/v10_p2
FIX: Problem with badge in tab in expedition card
|
2019-04-08 13:33:59 +02:00 |
|
Ion
|
b64cb4129f
|
Add resources tab for products/services
|
2019-04-07 23:52:49 +02:00 |
|
Laurent Destailleur
|
fad2fa48dd
|
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
|
2019-04-07 15:44:17 +02:00 |
|
Ion
|
71f30266dc
|
Add service to getElementProperties
|
2019-04-07 12:53:52 +02:00 |
|
Laurent Destailleur
|
54714bc755
|
Deprecated property ->fk_departement is now ->state_id everywhere.
|
2019-04-05 20:06:13 +02:00 |
|
Laurent Destailleur
|
b6c19e0f35
|
Fix var not defined
|
2019-04-05 19:48:32 +02:00 |
|
Laurent Destailleur
|
becefeebff
|
Fix upload of files without extension
|
2019-04-05 19:39:49 +02:00 |
|
Laurent Destailleur
|
734b97e255
|
Fix upload of files without extension
|
2019-04-05 19:39:04 +02:00 |
|
Laurent Destailleur
|
00cdf13a15
|
Revert "Do not close php tags"
This reverts commit 1db134c2a0.
|
2019-04-05 11:09:39 +02:00 |
|
Alexandre SPANGARO
|
b64ee3af70
|
FIX: Problem with badge in tab in expedition card
|
2019-04-04 17:02:18 +02:00 |
|
Laurent Destailleur
|
1f00e24abc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-04-03 18:52:47 +02:00 |
|
Laurent Destailleur
|
9e5d87e821
|
Fix warning
|
2019-04-03 18:39:27 +02:00 |
|
Laurent Destailleur
|
82c19a6372
|
FIX Avoid error 500 when extension php-intl not loaded
|
2019-04-03 18:38:27 +02:00 |
|
Laurent Destailleur
|
1db134c2a0
|
Do not close php tags
|
2019-04-03 18:13:39 +02:00 |
|
Laurent Destailleur
|
c5f5abc67d
|
Fix css for MD theme
|
2019-04-03 14:37:38 +02:00 |
|
Laurent Destailleur
|
80be77d95d
|
Merge pull request #10948 from ptibogxiv/patch-148
fix term autoOrManual
|
2019-04-03 11:03:44 +02:00 |
|
Laurent Destailleur
|
bb9cd05ea8
|
Fix phpcs
|
2019-04-02 20:02:43 +02:00 |
|
Laurent Destailleur
|
8a6e28860b
|
A better transition with deprecation
|
2019-04-01 22:09:24 +02:00 |
|
Laurent Destailleur
|
7db443e8ab
|
Better compatibility
|
2019-04-01 21:14:15 +02:00 |
|
ptibogxiv
|
5d25c33ff5
|
fix term
|
2019-04-01 20:49:41 +02:00 |
|
Laurent Destailleur
|
8fe1be1a67
|
Removed deprecated use of string in dol_print_date(). Only date allowed.
|
2019-04-01 19:27:34 +02:00 |
|
Laurent Destailleur
|
fc983fa65c
|
Move a function into functions2.lib.php
|
2019-04-01 18:46:13 +02:00 |
|
Laurent Destailleur
|
0c051e0cf0
|
Merge pull request #10923 from ptibogxiv/patch-145
NEW automatic / manual selector form
|
2019-04-01 18:44:05 +02:00 |
|
Laurent Destailleur
|
5d9a7e0d80
|
Fix phpcs
|
2019-04-01 18:21:59 +02:00 |
|
Laurent Destailleur
|
0091b65a83
|
Fix phpcs
|
2019-04-01 18:10:14 +02:00 |
|
Laurent Destailleur
|
c07159fee9
|
Fix regression in timesheet. Keep extrafield of task for the moment.
|
2019-03-31 22:06:41 +02:00 |
|
Laurent Destailleur
|
d572a9258c
|
Merge branch 'develop' into new_evol_time_spent_views
|
2019-03-31 19:12:27 +02:00 |
|
Laurent Destailleur
|
039e6034d1
|
Merge pull request #10936 from aspangaro/10.0_WARNING
LOG_WARNING on function dol_print_date with deprecated value
|
2019-03-31 18:45:01 +02:00 |
|
Frédéric FRANCE
|
ddd1c04eae
|
phpcs fix
|
2019-03-31 09:27:11 +02:00 |
|
Laurent Destailleur
|
fca404e8d5
|
Show price without tax to prepare tax per customer country.
|
2019-03-30 19:30:58 +01:00 |
|
Laurent Destailleur
|
be21755378
|
Add page id to help debug in header
|
2019-03-29 23:04:09 +01:00 |
|
Laurent Destailleur
|
697a2e5576
|
Show time to bill and billed in list of tasks
|
2019-03-29 14:34:55 +01:00 |
|
Alexandre SPANGARO
|
8163739a68
|
LOG_WARNING on function dol_print_date with deprecated value
|
2019-03-28 12:03:04 +01:00 |
|
ptibogxiv
|
2c71b98d0d
|
NEW automatic / manual selector form
|
2019-03-27 11:05:43 +01:00 |
|
Laurent Destailleur
|
513ef1e727
|
Fix label short
|
2019-03-25 16:16:08 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
a950d8389e
|
WIP Attach document to expense report lines
|
2019-03-24 20:22:05 +01:00 |
|
Laurent Destailleur
|
b2eee520df
|
Fix phpcs
|
2019-03-24 16:11:12 +01:00 |
|
Laurent Destailleur
|
152c27139f
|
Doc
|
2019-03-24 14:54:04 +01:00 |
|
Laurent Destailleur
|
614b4afeb0
|
NEW The preview of PDF files generates 1 png file even if several pages.
|
2019-03-24 14:53:26 +01:00 |
|
Laurent Destailleur
|
949ef79227
|
Better error message
|
2019-03-24 14:26:16 +01:00 |
|
Laurent Destailleur
|
fad6efd86c
|
WIP file attachment on expense report lines
|
2019-03-24 13:27:26 +01:00 |
|
Laurent Destailleur
|
df9e121ac6
|
Enhance the module debugbar. Do not scan the log anymore.
|
2019-03-23 14:37:54 +01:00 |
|
Laurent Destailleur
|
cd6a0bacdd
|
Look and feel v10
|
2019-03-22 14:32:15 +01:00 |
|
Laurent Destailleur
|
28fede950f
|
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
|
2019-03-22 13:00:48 +01:00 |
|
atm-ph
|
b202169e9a
|
New evol "Input per day" display
|
2019-03-21 15:20:59 +01:00 |
|
atm-ph
|
fa41eeec7f
|
New evol "Input per week" display
|
2019-03-21 14:21:29 +01:00 |
|
Laurent Destailleur
|
70c2ffc816
|
FIX toggle of login_block was ko with eldy theme
|
2019-03-19 14:22:57 +01:00 |
|
Laurent Destailleur
|
1a8902f23e
|
Fix migration for compatibility
|
2019-03-19 12:03:02 +01:00 |
|
Laurent Destailleur
|
2a8056b075
|
Merge pull request #10881 from frederic34/patch-5
phpcs fix
|
2019-03-19 11:15:16 +01:00 |
|
Frédéric FRANCE
|
03cd321aeb
|
phpcs fix
|
2019-03-18 20:18:38 +01:00 |
|
Frédéric FRANCE
|
135df4b3ce
|
Usage of ELSE IF is discouraged; use ELSEIF instead
|
2019-03-18 11:24:56 +01:00 |
|
Laurent Destailleur
|
b3dc6d7d1d
|
NEW Generation of doc by modulebuilder can include README and CHANGELOG
|
2019-03-17 19:33:25 +01:00 |
|
Laurent Destailleur
|
5f9fa817fb
|
Fix bad log
|
2019-03-16 23:41:06 +01:00 |
|
Laurent Destailleur
|
e5567c7ee4
|
Fix typo
|
2019-03-16 14:48:41 +01:00 |
|
Laurent Destailleur
|
40c2ca4310
|
Fix label of status of third party record when using smartphone
|
2019-03-15 23:08:00 +01:00 |
|
Laurent Destailleur
|
7a5a561170
|
Fix label of status of invoice record when using smartphone
|
2019-03-15 23:00:50 +01:00 |
|
Laurent Destailleur
|
91f80934f3
|
Fix: On smartphone, hide label of status only on lists.
|
2019-03-15 20:39:55 +01:00 |
|
Laurent Destailleur
|
b6cacf3a20
|
Fix label of status for members on smartphone
|
2019-03-15 20:18:35 +01:00 |
|
Laurent Destailleur
|
d512e54407
|
Restore toggle of login_block because it was no more visible
|
2019-03-15 20:10:39 +01:00 |
|
Laurent Destailleur
|
3b4bcc67c9
|
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
NEW/FIX Theme sidebarr toggle
|
2019-03-15 19:41:39 +01:00 |
|
Laurent Destailleur
|
6f0fbc42c1
|
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
|
2019-03-15 15:16:29 +01:00 |
|
Laurent Destailleur
|
e5c08978c3
|
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
|
2019-03-15 15:13:28 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +01:00 |
|
Laurent Destailleur
|
d31b632d96
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security.lib.php
|
2019-03-15 11:06:49 +01:00 |
|
Laurent Destailleur
|
074ba0729a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-15 11:00:52 +01:00 |
|
Laurent Destailleur
|
84bff41543
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-03-15 11:00:24 +01:00 |
|
Laurent Destailleur
|
6c2cad3d48
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/security.lib.php
|
2019-03-15 11:00:00 +01:00 |
|
Laurent Destailleur
|
e326c4d579
|
Look and feel v10
|
2019-03-15 10:48:10 +01:00 |
|
gauthier
|
8375b47e74
|
FIX : in fact expensereport must be in $check array
|
2019-03-15 10:21:50 +01:00 |
|
Laurent Destailleur
|
86c5dc20e3
|
NEW Can choose the root category to show for TakePOS module
|
2019-03-15 02:12:40 +01:00 |
|
Laurent Destailleur
|
0afbd70c2c
|
Merge pull request #10833 from grandoc/new_branch_14_03_2019
update with html5 compliant code
|
2019-03-14 18:04:06 +01:00 |
|
gauthier
|
3fb6978bc8
|
FIX : no need to test anything to display documents tabs on expense report
|
2019-03-14 17:36:49 +01:00 |
|
Laurent Destailleur
|
8a752ae657
|
Merge pull request #10744 from OPEN-DSI/fix-show-action-done-sortfield
Fix sort by field in all events (action and emailing type)
|
2019-03-14 17:00:12 +01:00 |
|
Laurent Destailleur
|
be0535d11f
|
Merge pull request #10805 from frederic34/patch-2
update doc
|
2019-03-14 16:55:29 +01:00 |
|
Philippe GRAND
|
27b7ec8202
|
update with html5 compliant code
|
2019-03-14 14:24:17 +01:00 |
|
Philippe GRAND
|
d506cf7700
|
update with html5 compliant code
|
2019-03-14 14:21:54 +01:00 |
|
Philippe GRAND
|
68c6c0513d
|
update with html5 compliant code
|
2019-03-14 14:20:32 +01:00 |
|
Philippe GRAND
|
38822a9bb1
|
update with html5 compliant code
|
2019-03-14 14:18:44 +01:00 |
|
Philippe GRAND
|
6984cd25d8
|
update with html5 compliant code
|
2019-03-14 14:11:43 +01:00 |
|
Philippe GRAND
|
0832e9873c
|
update with html5 compliant code
|
2019-03-14 14:10:41 +01:00 |
|
Philippe GRAND
|
63b1a1459b
|
update with html5 compliant code
|
2019-03-14 14:09:54 +01:00 |
|
Laurent Destailleur
|
f8a4d9075b
|
Fix css for fontawesome 5
|
2019-03-14 11:48:25 +01:00 |
|
Laurent Destailleur
|
fcbd39fda9
|
Fix typo
|
2019-03-13 19:07:19 +01:00 |
|
Laurent Destailleur
|
e7cd8d690c
|
Remove warnings
|
2019-03-13 19:06:45 +01:00 |
|
Laurent Destailleur
|
1bd9d6a8e5
|
Fix font awesome 5 picto for notes
|
2019-03-13 15:02:43 +01:00 |
|
Laurent Destailleur
|
7d82073eab
|
Use fontawesome for icon "setup".
|
2019-03-12 11:57:55 +01:00 |
|
Laurent Destailleur
|
d762766a56
|
Font awesome 5 by default
|
2019-03-12 10:11:34 +01:00 |
|
John BOTELLA
|
be2885c75b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle
|
2019-03-12 09:24:42 +01:00 |
|
Frédéric FRANCE
|
40a1562077
|
update doc
|
2019-03-12 09:09:26 +01:00 |
|
Laurent Destailleur
|
abdc2aa21a
|
Fix phpcs
|
2019-03-11 21:03:23 +01:00 |
|
Laurent Destailleur
|
e5f0c8e0e7
|
Look and feel
|
2019-03-11 20:54:25 +01:00 |
|
John BOTELLA
|
57c6c60118
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-11 14:44:35 +01:00 |
|
John BOTELLA
|
5d7118340b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-11 14:40:19 +01:00 |
|
Laurent Destailleur
|
fac329e637
|
Clean code
|
2019-03-11 01:01:15 +01:00 |
|
Laurent Destailleur
|
935fe7c22a
|
Debug and enhance modulebuilder.
|
2019-03-10 19:33:28 +01:00 |
|
John BOTELLA
|
ccebb8d1a7
|
Fix travis errors
|
2019-03-08 14:40:22 +01:00 |
|
John BOTELLA
|
37cd62b564
|
Add user friendly behavior
|
2019-03-08 14:26:06 +01:00 |
|
John BOTELLA
|
218690db00
|
add css behavior
|
2019-03-07 17:05:27 +01:00 |
|
John BOTELLA
|
a0b14b9105
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-07 15:53:41 +01:00 |
|
John BOTELLA
|
74c8754092
|
fix travis
|
2019-03-07 15:49:16 +01:00 |
|
John BOTELLA
|
5ea5d51247
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-07 09:41:03 +01:00 |
|
John BOTELLA
|
89157234b7
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-07 09:33:11 +01:00 |
|
Laurent Destailleur
|
0c2a0c643b
|
NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__
|
2019-03-06 14:33:05 +01:00 |
|
Lionel VESSILLER
|
bf5b482f3d
|
Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request
|
2019-03-06 09:05:07 +01:00 |
|
John BOTELLA
|
e382f13637
|
remove test
|
2019-03-05 17:16:38 +01:00 |
|
John BOTELLA
|
ef9ad4d109
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-05 17:14:59 +01:00 |
|
John BOTELLA
|
600f0c9fa6
|
Fix condition
|
2019-03-05 17:14:29 +01:00 |
|
John BOTELLA
|
72d96d2ac3
|
prepare badges
|
2019-03-05 17:13:20 +01:00 |
|
John BOTELLA
|
6b98eecd32
|
fix compatibility status
|
2019-03-05 16:58:05 +01:00 |
|
John BOTELLA
|
7a4540088a
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-05 15:37:17 +01:00 |
|
John BOTELLA
|
95981ca14c
|
PR feedback
|
2019-03-05 15:26:19 +01:00 |
|
Lionel VESSILLER
|
9b797eb980
|
Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event
|
2019-03-05 14:55:04 +01:00 |
|
Laurent Destailleur
|
4a582485b9
|
Debug module ticket
|
2019-03-04 19:19:09 +01:00 |
|
John BOTELLA
|
7cadaca8fc
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-04 11:37:16 +01:00 |
|
John BOTELLA
|
74caaca827
|
fix travis errors
|
2019-03-04 11:15:01 +01:00 |
|
John BOTELLA
|
c420cab500
|
fix travis errors
|
2019-03-04 11:11:15 +01:00 |
|
Laurent Destailleur
|
1931f43ce7
|
Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
|
2019-03-03 00:05:07 +01:00 |
|
Laurent Destailleur
|
8fce6e5e31
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
|
2019-03-02 19:13:37 +01:00 |
|
Laurent Destailleur
|
a5711a51ab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
|
2019-03-02 18:30:17 +01:00 |
|
Laurent Destailleur
|
4f9981063f
|
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
|
2019-03-02 18:26:50 +01:00 |
|
Laurent Destailleur
|
e215bfdb66
|
Merge pull request #10721 from frederic34/bad-exclude-pattern
fix exclude from phpcs
|
2019-03-02 18:23:02 +01:00 |
|
Laurent Destailleur
|
03237d1730
|
NEW Look and feel v10 - Add CSS tabBarNoTop
|
2019-03-02 18:20:13 +01:00 |
|
Laurent Destailleur
|
5f6ca1119a
|
Replace arrow picto with fontawesome
|
2019-03-02 14:07:13 +01:00 |
|
Frédéric FRANCE
|
65551864d5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-03-02 12:24:15 +01:00 |
|
Laurent Destailleur
|
359f2c6e81
|
NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
Removed migration files
|
2019-03-02 12:16:37 +01:00 |
|
Frédéric FRANCE
|
40d34940f1
|
fix exclude from phpcs
|
2019-03-02 10:00:51 +01:00 |
|
John BOTELLA
|
421c009e58
|
Standardise new function name
|
2019-03-01 15:33:23 +01:00 |
|
John BOTELLA
|
162c3249cf
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
|
2019-03-01 13:49:42 +01:00 |
|
John BOTELLA
|
b222c44bb9
|
Add helper functions and little review size of badges
|
2019-03-01 12:01:25 +01:00 |
|
Frédéric FRANCE
|
4f9e35f350
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-28 20:48:23 +01:00 |
|
Laurent Destailleur
|
429da47d68
|
Fix default language of reminders
|
2019-02-28 13:11:14 +01:00 |
|
Laurent Destailleur
|
c444521abc
|
IFTTT
|
2019-02-28 11:00:40 +01:00 |
|
Frédéric FRANCE
|
ba4ca5d7c2
|
add visibility
|
2019-02-28 00:15:32 +01:00 |
|
Laurent Destailleur
|
29cfa03fa4
|
Fix font awesome 5 regressions
|
2019-02-27 13:54:39 +01:00 |
|
John BOTELLA
|
9f0a93f68f
|
Add color lib for color automation
|
2019-02-26 17:44:16 +01:00 |
|
Alexandre SPANGARO
|
2da1447a0b
|
Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin
|
2019-02-25 09:12:04 +01:00 |
|
Alexandre SPANGARO
|
acb9cfe07a
|
NEW: Add LinkedIn field
|
2019-02-25 09:07:58 +01:00 |
|
Laurent Destailleur
|
6b46a927f1
|
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket
|
2019-02-24 20:53:54 +01:00 |
|
ptibogxiv
|
47f5ff3303
|
Fix declare functions2.lib.php for donations API
|
2019-02-24 20:51:00 +01:00 |
|
Laurent Destailleur
|
c002fd68ae
|
Merge pull request #10679 from ptibogxiv/patch-129
Fix declare functions2.lib.php for donations API
|
2019-02-24 20:49:59 +01:00 |
|
Laurent Destailleur
|
e349fe780e
|
Merge pull request #10641 from OPEN-DSI/fix-show-action-done-emailing
Fix url for emailing type event (link to emailing card)
|
2019-02-24 20:48:57 +01:00 |
|
Laurent Destailleur
|
3fa2680859
|
Merge pull request #10669 from frederic34/html5fix
replace by html5 in ticket supplier_proposal, stripe, societe
|
2019-02-24 20:36:24 +01:00 |
|
Frédéric FRANCE
|
894123fb06
|
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
|
2019-02-24 20:06:55 +01:00 |
|
ptibogxiv
|
efd27ec1d8
|
Fix declare functions2.lib.php for donations API
|
2019-02-24 16:11:52 +01:00 |
|
Frédéric FRANCE
|
167a857f4c
|
replace html code by html5 in contact
|
2019-02-24 14:47:47 +01:00 |
|
Frédéric FRANCE
|
cdf5348b47
|
Update ajax.lib.php
|
2019-02-23 18:15:56 +01:00 |
|
Laurent Destailleur
|
0a83bc474c
|
Merge pull request #10635 from grandoc/new_branch_19_02_2019
update with html5 compliant code
|
2019-02-23 14:09:17 +01:00 |
|
Lionel VESSILLER
|
cdc2c5ae77
|
Company Lib : Fix contact events with no thirdparty
|
2019-02-21 09:49:46 +01:00 |
|
Lionel VESSILLER
|
d10c5cab34
|
Company Lib : Fix url for emailing type event (link to emailing card)
|
2019-02-20 15:14:50 +01:00 |
|
Laurent Destailleur
|
a3a89b755f
|
NEW Gain space by moving the meteo on title line
|
2019-02-20 06:01:13 +01:00 |
|
Laurent Destailleur
|
abfd610bbc
|
Fix quote not closed
|
2019-02-20 03:44:08 +01:00 |
|
Philippe GRAND
|
d83b77432d
|
update with html5 compliant code
|
2019-02-19 17:42:12 +01:00 |
|
Regis Houssin
|
1c3541295b
|
FIX wrong class name "CUnits instead CMeasuringUnits"
|
2019-02-19 09:24:30 +01:00 |
|
Laurent Destailleur
|
e644de4a70
|
Fix for font awesome 5
|
2019-02-15 15:30:21 +01:00 |
|
Laurent Destailleur
|
c480f4be68
|
FIX Bad remote ip address when user is using a proxy
|
2019-02-15 15:17:24 +01:00 |
|
Laurent Destailleur
|
a7af1b1765
|
Remove deprecated code
|
2019-02-14 16:29:13 +01:00 |
|
Laurent Destailleur
|
42f754cbc0
|
Merge pull request #10596 from frederic34/patch-33
Update functionsnumtoword.lib.php
|
2019-02-14 13:33:03 +01:00 |
|
Laurent Destailleur
|
6b00bb1a6f
|
Merge pull request #10583 from frederic34/patch-18
Update company.lib.php
|
2019-02-14 13:26:21 +01:00 |
|
Frédéric FRANCE
|
0594061ef4
|
Update functionsnumtoword.lib.php
|
2019-02-14 00:03:10 +01:00 |
|
Frédéric FRANCE
|
154ba78ee7
|
Update company.lib.php
|
2019-02-13 22:43:12 +01:00 |
|
Frédéric FRANCE
|
b9d37c276d
|
update doc in barcode.lib.php
|
2019-02-13 22:23:14 +01:00 |
|
Laurent Destailleur
|
2311912d8a
|
Merge branch 'develop' into dev_importproduct_measuringunit
|
2019-02-13 16:35:46 +01:00 |
|
Laurent Destailleur
|
69313cbf0d
|
Merge pull request #10567 from frederic34/patch-18
Update images.lib.php
|
2019-02-13 16:25:32 +01:00 |
|
florian HENRY
|
de87321c15
|
fix travcis
|
2019-02-13 10:28:08 +01:00 |
|
florian HENRY
|
e2d13c0e1f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
|
2019-02-13 09:23:52 +01:00 |
|
florian HENRY
|
5c059c897d
|
fix travis (mosty for dev no conerne by my changes)
|
2019-02-13 09:21:14 +01:00 |
|
florian HENRY
|
d88475c61a
|
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
|
2019-02-13 08:59:18 +01:00 |
|
Frédéric FRANCE
|
e4b73e8273
|
Update images.lib.php
|
2019-02-12 23:39:59 +01:00 |
|
Frédéric FRANCE
|
2aae952760
|
fix doc in tax.lib.php
|
2019-02-12 23:25:26 +01:00 |
|
Laurent Destailleur
|
5fceee3048
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-02-12 19:02:19 +01:00 |
|
Laurent Destailleur
|
affbd20cdb
|
FIX Bad link in menu manager
|
2019-02-12 18:56:32 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Alexandre SPANGARO
|
b99149b940
|
Move error on function dol_include_once() to LOG_WARNING
|
2019-02-12 16:34:52 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
ATM-Nicolas
|
4e35ebe52a
|
FIX : Default sign out icon if not using Font Awesome 5
|
2019-02-12 10:43:00 +01:00 |
|
Laurent Destailleur
|
27cad29e1e
|
Fix regression of right alignement
|
2019-02-11 15:06:52 +01:00 |
|
Laurent Destailleur
|
0bd30b160a
|
Fix picto logout with fontawesome 5
|
2019-02-11 11:55:48 +01:00 |
|
Frédéric FRANCE
|
152d8ffcbf
|
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-10 11:08:59 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
522afd8e7b
|
Fix font awesome 5
|
2019-02-09 13:11:02 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Laurent Destailleur
|
38d4284638
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
|
2019-02-08 11:26:08 +01:00 |
|
Laurent Destailleur
|
471f11dace
|
Merge pull request #10502 from hregis/9.0_merge
FIX wrong merged conflict
|
2019-02-08 09:34:49 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
3bdf017d41
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:59 +01:00 |
|
Laurent Destailleur
|
8d82135033
|
Fix missing \n
|
2019-02-07 19:39:23 +01:00 |
|
Laurent Destailleur
|
491bfbdbfc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:04 +01:00 |
|
Laurent Destailleur
|
89af7b0e98
|
Add doctype to web site
|
2019-02-07 19:38:36 +01:00 |
|
Laurent Destailleur
|
789c089e14
|
Code comment
|
2019-02-05 13:08:28 +01:00 |
|
Regis Houssin
|
8860eab6b1
|
FIX wrong merged conflict
|
2019-02-05 07:40:50 +01:00 |
|
Frédéric FRANCE
|
e1e14ae6e6
|
wip
|
2019-02-03 22:58:56 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
49d695c9b2
|
Merge pull request #10479 from frederic34/patch-2
remove psr2 warning for else if usage
|
2019-02-03 19:06:38 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
25abceb116
|
remove psr2 warning for else if usage
|
2019-02-02 08:59:37 +01:00 |
|
Frédéric FRANCE
|
96de1b175c
|
clean missing spaces in the last merge
|
2019-02-02 08:51:30 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
08050434a1
|
Merge pull request #10435 from wdammak/patch-22
Wrapping for stock movements
|
2019-02-01 16:11:37 +01:00 |
|
Laurent Destailleur
|
cf89fbd165
|
Merge pull request #10474 from ATM-Nicolas/new_contact_related_item_tab
New contact related item tab
|
2019-02-01 15:39:39 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
ATM-Nicolas
|
2cbb58c2eb
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab
|
2019-02-01 10:54:42 +01:00 |
|
ATM-Nicolas
|
f432a874e6
|
NEW : Contact related items tab
|
2019-02-01 10:51:28 +01:00 |
|
Laurent Destailleur
|
3e6aef472d
|
css
|
2019-01-31 20:53:59 +01:00 |
|
Laurent Destailleur
|
189323ad58
|
Fix when using image into description
|
2019-01-31 18:12:34 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
9fdba921b4
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
|
2019-01-30 16:48:33 +01:00 |
|
Laurent Destailleur
|
81ae4c52c5
|
Merge pull request #10446 from mapiolca/8.0
Fix #10317 et #10318
|
2019-01-30 16:43:14 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Pierre Ardoin
|
b6df02e795
|
Correction oubli date de livraison
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
|
2019-01-29 11:47:39 +01:00 |
|
Laurent Destailleur
|
08a181bfbf
|
Fix substitution of REF_CLIENT and REF_SUPPLIER
|
2019-01-29 11:00:17 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
wdammak
|
388efb6773
|
Wrapping for stock movements
|
2019-01-28 04:36:26 +01:00 |
|
Frédéric FRANCE
|
ff39491f15
|
wip
|
2019-01-27 23:31:37 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
462c1f9c1a
|
Merge pull request #10413 from mapiolca/patch-8
Add date_livraison substitution
|
2019-01-26 15:38:00 +01:00 |
|
Pierre Ardoin
|
6fdbded588
|
Update functions.lib.php
|
2019-01-26 14:40:00 +01:00 |
|
Laurent Destailleur
|
fd192f10c4
|
Merge pull request #10341 from hregis/8.0_bug
FIX security broken with Multicompany
|
2019-01-26 14:28:13 +01:00 |
|
Pierre Ardoin
|
78f8607d41
|
Add date_livraison substitution
Complete the substitution for supplier orders.
|
2019-01-25 13:15:24 +01:00 |
|
Laurent Destailleur
|
e860d664d7
|
Fix substitution of __REF_CLIENT__
|
2019-01-23 11:54:20 +01:00 |
|
Laurent Destailleur
|
8104b7fa2d
|
look and feel v10
|
2019-01-22 15:40:51 +01:00 |
|
Laurent Destailleur
|
42743027d4
|
Merge branch 'develop' into objectline_etc
|
2019-01-21 18:04:48 +01:00 |
|
torvista
|
9b1cf648dc
|
more validation fixes
|
2019-01-21 16:19:31 +01:00 |
|
torvista
|
07b2bb6715
|
Swap of align/valign/border/width for css
Removal of type="text/javascript"
|
2019-01-20 23:36:39 +01:00 |
|
Laurent Destailleur
|
7493ba018a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-01-20 20:38:26 +01:00 |
|
Laurent Destailleur
|
3ddfcbe3bb
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
dev/setup/codesniffer/ruleset.xml
|
2019-01-20 20:36:45 +01:00 |
|
Regis Houssin
|
d5b66eeffb
|
FIX $user is already in parameters
|
2019-01-19 18:12:48 +01:00 |
|
Laurent Destailleur
|
4ffd7de9f7
|
doc
|
2019-01-19 16:15:05 +01:00 |
|