Laurent Destailleur
0b3e917155
CSS
2020-05-14 14:30:26 +02:00
ATM john
9f6a5d4cc9
Fix multicompany supplier product price filter
2020-05-14 10:50:20 +02:00
Frédéric FRANCE
be78ef5fb3
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-13 17:53:41 +02:00
Laurent Destailleur
3b87b7c359
CSS
2020-05-13 13:29:50 +02:00
Frédéric FRANCE
7e5a07a863
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-12 07:57:32 +02:00
Laurent Destailleur
ed68b73ef5
Merge pull request #13821 from atm-quentin/NEW_invoice_stat_graph_and_categ_search
...
NEW Add invoice stat graph and categ search
2020-05-12 03:31:09 +02:00
Laurent Destailleur
632ca40b1d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-12 03:04:59 +02:00
Laurent Destailleur
75cd7d7e72
Code comment
2020-05-12 03:04:48 +02:00
Laurent Destailleur
7be47097e9
Merge pull request #13867 from frederic34/patch-4
...
Only add empty select if no multiselect
2020-05-12 03:00:10 +02:00
Frédéric FRANCE
034df95ca1
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-11 20:29:07 +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
Frédéric FRANCE
9c90996560
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-11 19:11:00 +02:00
Laurent Destailleur
44d36815bd
Look and feel v12
2020-05-11 19:00:27 +02:00
Frédéric FRANCE
097de7b3cd
Only add empty select if no multiselect
2020-05-11 18:34:54 +02:00
Frédéric FRANCE
3e5489f7f6
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-11 18:17: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
796f97c671
Support tag $capture in input of files
2020-05-10 15:08:01 +02:00
Frédéric FRANCE
bd7a2d23a0
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-08 21:29:12 +02:00
Laurent Destailleur
c28a3e85a3
Fix constructor
2020-05-08 14:35:03 +02:00
Laurent Destailleur
6a2bb08107
Fix constructor
2020-05-08 14:34:02 +02:00
Laurent Destailleur
0138ab3f7c
Fix $weblangs must be initialized with language of page
2020-05-08 14:29:04 +02:00
Laurent Destailleur
42ee755ea5
Look and feel v12
2020-05-08 02:52:55 +02:00
Frédéric FRANCE
8f9ee3250d
clean
2020-05-07 23:28:32 +02:00
Frédéric FRANCE
b88a84323b
clean
2020-05-07 22:59:34 +02:00
Frédéric FRANCE
7e7a10f8d2
clean
2020-05-07 22:55:21 +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
Frédéric FRANCE
f13c3447f1
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-07 21:49:01 +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
6d5e83ad66
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-07 16:16:10 +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
6c8d302dd9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/list.php
htdocs/compta/prelevement/rejets.php
htdocs/fourn/commande/index.php
2020-05-07 12:03:49 +02:00
Laurent Destailleur
d6887f3ca4
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/bons.php
htdocs/compta/prelevement/list.php
htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
Laurent Destailleur
d4400cf80f
FIX links into emails of notifications
2020-05-07 11:39:32 +02:00
Frédéric FRANCE
3fcd9e6949
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-06 22:17:43 +02:00
Laurent Destailleur
1ec8b31e46
Fix remove action param in url to allow a second try without the error
...
message
2020-05-06 15:15:12 +02:00
Tobias Sekan
8334afa154
Add link to new vendor invoice are page
2020-05-06 11:49:45 +02:00
Tobias Sekan
9b437c0585
Link to new customer invoice area
2020-05-06 11:36:30 +02:00
Frédéric FRANCE
574a4d4ce8
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-06 10:54:59 +02:00
atm-quentin
b6aa766c72
FIX stickler
2020-05-06 09:37:17 +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
8512fba7db
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-06 03:49:25 +02:00
Laurent Destailleur
247acdd274
Fix position of custom groups of modules
2020-05-06 03:47:28 +02:00
Laurent Destailleur
e7f0035237
Merge pull request #13811 from frederic34/patch-4
...
nowtime is not defined
2020-05-06 02:23:58 +02:00
Laurent Destailleur
eacb1b3b2e
Debug modulebuilder
2020-05-05 21:45:10 +02:00
Frédéric FRANCE
93cac43306
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-05 18:37:56 +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
atm-quentin
1b35380dda
NEW stats invoice graph with 3 bars
2020-05-05 16:13:04 +02:00
Laurent Destailleur
36a0780f14
More complete fix for #13817
2020-05-05 15:20:40 +02:00
Laurent Destailleur
7e6b5a384d
Code comment
2020-05-05 15:16:30 +02:00
atm-lena
78a427c996
FIX wrong user right's name to top menu "commercial"
2020-05-05 14:35:03 +02:00
Frédéric FRANCE
93e69d515d
nowtime is not defined
2020-05-05 06:38:24 +02:00
Laurent Destailleur
d2d9ce3576
Merge pull request #13794 from atm-maxime/fix_addline_titles
...
Fix addline titles
2020-05-04 22:08:34 +02:00
Laurent Destailleur
2afd38e2f6
FIX Combo list of available users to filter on the list of leaves.
2020-05-04 21:59:31 +02:00
Laurent Destailleur
5e4ef9266e
Fix update template to use for notifications
2020-05-04 20:30:02 +02:00
Laurent Destailleur
6d894b7abd
Fix missing link in message
2020-05-04 19:08:31 +02:00
Laurent Destailleur
821e11ca3c
Look and feel v12
2020-05-04 17:13:31 +02:00
Laurent Destailleur
3857c08277
Fix quick search on MO
2020-05-04 13:24:09 +02:00
Laurent Destailleur
4b34a6bd4a
Look and feel
2020-05-04 12:43:47 +02:00
Laurent Destailleur
535ae612f3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-03 22:48:48 +02:00
Laurent Destailleur
4d6a45d491
Major doxygen fix
2020-05-03 22:48:35 +02:00
Laurent Destailleur
dc5731dcd6
Merge pull request #13789 from simicar29/dev-selectproduits
...
Add / as a delimiter for replacement pattern in select_produits*
2020-05-03 21:47:26 +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
Maxime Kohlhaas
e0ebe85c13
Fix addline titles
2020-05-03 09:15:12 +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
Marc Guenneugues
b5abb72c5b
Add / as a delimiter for replacement pattern in select_produits*
2020-05-02 16:36:40 +02:00
Laurent Destailleur
48e62eca0c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-05-02 15:19:09 +02:00
Laurent Destailleur
a88ab40384
Clean phpcs
2020-05-02 15:18:59 +02:00
Frédéric FRANCE
44f914fede
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-02 13:29:56 +02:00
Laurent Destailleur
099871e217
Merge pull request #13649 from atm-john/12.0_add_class_unitstools
...
NEW class tool for converting units
2020-05-02 13:05:51 +02:00
Frédéric FRANCE
39ac031aa9
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-02 06:59:54 +02:00
Marc Guenneugues
fbabfe9a71
Correct typo
2020-05-02 06:53:11 +02:00
Marc Guenneugues
79647b35cd
Enable multiple mass actions on a single page - dev branch
2020-05-02 06:42:12 +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
Frédéric FRANCE
f89131e2a0
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-01 22:27:04 +02:00
Laurent Destailleur
18a36de69b
Merge pull request #13779 from frederic34/patch-4
...
$tmpplugin was defined after use
2020-05-01 22:02:04 +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
aab9a2ff75
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-05-01 21:03:38 +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
385f998254
Fix restore param --quick
2020-05-01 21:01:40 +02:00
Frédéric FRANCE
3c7265e357
Merge remote-tracking branch 'upstream/develop' into free_email
2020-05-01 17:12:17 +02:00
Laurent Destailleur
c1b530f58f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/get_menudiv.php
2020-05-01 15:56:01 +02:00
Laurent Destailleur
1c7873b4f4
FIX Sanitizing menu parameter
2020-05-01 15:53:56 +02:00
Frédéric FRANCE
92898c9562
enable free emails with select2
2020-05-01 11:27:11 +02:00
Frédéric FRANCE
fddbe7c929
$tmpplugin was defined after use
2020-05-01 07:50:46 +02:00
Laurent Destailleur
c27b3c5966
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2020-04-30 18:49:20 +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
6ec6a4465a
FIX Setup of thirdparty or contact for external users
2020-04-29 20:21:17 +02:00
Laurent Destailleur
908e5d7f0a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/api/class/api_setup.class.php
2020-04-29 18:05:01 +02:00
Laurent Destailleur
84bca036c9
FIX Link missing into email of some notification
2020-04-29 18:03:28 +02:00
Laurent Destailleur
a0c013d87b
Fix missing link
...
Conflicts:
htdocs/core/class/notify.class.php
2020-04-28 19:18:31 +02:00
Laurent Destailleur
66b33573ef
Fix menu
2020-04-28 18:30:38 +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
Laurent Destailleur
c22e13b138
FIX Avoid infinite loop when a fetch is inside a compute field.
2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af
FIX Extrafields of type price must be '' and not '0' if not defined
2020-04-28 14:27:42 +02:00
Laurent Destailleur
91523b4b64
FIX Can switch from double to price type for extrafields
...
Conflicts:
htdocs/core/tpl/admin_extrafields_edit.tpl.php
2020-04-28 14:27:22 +02:00
Laurent Destailleur
dd3a5949c0
FIX Avoid infinite loop when a fetch is inside a compute field.
2020-04-28 14:25:07 +02:00
Laurent Destailleur
2b00ae9e92
FIX Extrafields of type price must be '' and not '0' if not defined
2020-04-28 14:22:52 +02:00
Laurent Destailleur
7a73915e92
FIX Can switch from double to price type for extrafields
2020-04-28 14:22:13 +02:00
stickler-ci
2cf5f12a62
Fixing style errors.
2020-04-28 07:18:45 +00:00
kkhelifa-opendsi
908c653743
Merge branch 'develop' into stcommcontact
2020-04-28 09:03:17 +02:00
DEMAREST Maxime (Indelog)
740b2c9228
NEW possibilty to group payments by mode and show their subtotal
...
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
2020-04-28 09:01:00 +02:00
Laurent Destailleur
a40c2fdbfc
Debug v12
2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa
Look and feel v12
2020-04-28 02:10:26 +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
Laurent Destailleur
0de8cb7096
Add property shortlang
2020-04-27 18:38:11 +02:00
kamel
218fbfc70b
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:06:50 +02:00
kamel
28d330996c
Correction pour validation Stickler CI / stickler-ci
2020-04-27 18:01:07 +02:00
ATM john
41e597e739
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools
2020-04-27 17:46:22 +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
fe6fb12d18
Fix missing link
2020-04-27 17:13:23 +02:00
Laurent Destailleur
635b9bb0fe
FIX #13641
2020-04-27 15:27:03 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23
2020-04-27 14:14:13 +02:00
Laurent Destailleur
a7de160290
Merge pull request #13740 from simicar29/develop-hook-updateTotalPrice
...
ADD: New hook updateTotalPrice in commonObject update_price
2020-04-27 13:43:13 +02:00
Laurent Destailleur
4c605283f5
Fix phpcs
2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6
Fix phpcs
2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9
Fix phpcs
2020-04-26 23:52:23 +02:00
Laurent Destailleur
31ba277da7
Fix phpcs
2020-04-26 23:18:09 +02:00
Laurent Destailleur
b20d85b198
Fix phpcs
2020-04-26 23:06:52 +02:00
Laurent Destailleur
a36d0c96c1
Fix sql
2020-04-26 22:28:43 +02:00
Laurent Destailleur
1d68510c7d
Fix syntax error
2020-04-25 19:32:18 +02:00
Laurent Destailleur
6caa872280
Enable more PHPCS rules
2020-04-25 19:27:42 +02:00
Laurent Destailleur
068a890c36
Enable more PHPCS rules
2020-04-25 19:13:20 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Laurent Destailleur
0aec776d82
Merge pull request #13737 from lecoqlibre/develop
...
FIX CUnit->fetch id/rowid
2020-04-25 13:53:16 +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
Marc Guenneugues
fb2759eaf6
Correct lint errors
2020-04-25 10:32:35 +02:00
Marc Guenneugues
966fedc501
ADD: New hook updateTotalPrice in commonObject update_price
2020-04-25 10:19:09 +02:00
Laurent Destailleur
5ce3174181
Look and feel v12
2020-04-25 03:31:47 +02:00
Laurent Destailleur
38f2aad0c6
Debug asset module
2020-04-25 03:19:30 +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
Laurent Destailleur
d416edab1a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/accounting-files.php
2020-04-24 22:49:59 +02:00
Maxime Lecoq
9ed7ff80a1
FIX CUnit->fetch id/rowid
2020-04-24 21:08:47 +02:00
Laurent Destailleur
fc1a1c6afe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-24 19:56:29 +02:00
Laurent Destailleur
d11dcc35c3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2020-04-24 19:56:19 +02:00
Laurent Destailleur
df10b86d1f
FIX consistency of price w/wo vat wrong when price entered with tax
2020-04-24 19:52:34 +02:00
Laurent Destailleur
708f89c9dc
Merge pull request #13732 from pstructures/new-devlelop
...
Fixed Translation Issue Default Contact Address For Field
2020-04-24 19:00:04 +02:00
Laurent Destailleur
7bbfd2175d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/reception/class/reception.class.php
2020-04-24 18:58:47 +02:00
gauthier
e98671e404
FIX : Access to undeclared static property: Contact::$table_element
2020-04-24 15:22:38 +02:00
stickler-ci
6d4d638ec1
Fixing style errors.
2020-04-24 12:38:46 +00:00
Tobias Sekan
05bb94cd3f
fix wrong set e-mail for vCard + docu update
2020-04-24 14:12:43 +02:00
Frédéric FRANCE
1aafd4667b
fix countable php7 warning
2020-04-24 11:57:23 +02:00
Matt Sidnell
dd070cc680
Update commonobject.class.php
2020-04-23 20:37:15 +01: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
00e9ed1452
Merge pull request #13716 from atm-florian/11.0
...
fix: remove debug pring
2020-04-23 18:22:18 +02:00
Laurent Destailleur
dc0978e88b
Merge pull request #13720 from FHenry/dev_fix_odt
...
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 18:22:00 +02:00
Laurent Destailleur
8401f68bde
Update doc_generic_task_odt.modules.php
2020-04-23 18:21:17 +02:00
Laurent Destailleur
86be024dcc
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modFournisseur.class.php
2020-04-23 17:17:42 +02:00
florian HENRY
32385b75e1
travis
2020-04-23 16:18:31 +02:00
florian HENRY
7a206df96f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2020-04-23 16:04:58 +02:00
florian HENRY
6dafb30ee8
fix time duration substitution
2020-04-23 15:57:06 +02:00
florian HENRY
55a9aa5991
fix: missing duration odt task substitution
2020-04-23 15:55:37 +02:00
Laurent Destailleur
68e9d8463a
Debug MAIN_USE_ALTERNATE_TRANSLATION_FOR variable
2020-04-23 15:52:15 +02:00
florian HENRY
882b39628f
fix: uniformize extrafeild replacemnt for ODT docs
2020-04-23 15:50:42 +02:00
Laurent Destailleur
6819255b76
FIX #13650
2020-04-23 13:49:18 +02:00
florian HENRY
7972174787
remove debug pring
2020-04-23 13:44:23 +02:00
Laurent Destailleur
86928efb95
Var not defined
2020-04-23 13:35:40 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
ATM john
3f5270cf39
Remove getValue Method : usage of fetch_row is deprecated
2020-04-22 23:12:15 +02:00
ATM john
bf592489c0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools
2020-04-22 23:09:10 +02:00
Laurent Destailleur
ead78ae777
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 21:29:44 +02:00
Laurent Destailleur
de90f24bd4
Fix phpcs
2020-04-22 21:29:15 +02:00
Laurent Destailleur
3101f72b5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 18:28:59 +02: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
6b8ff56c20
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/html.formother.class.php
2020-04-22 18:26:26 +02:00
Laurent Destailleur
80271cc852
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-22 18:24:00 +02:00
Laurent Destailleur
7bc8a70b0a
FIX #13670
2020-04-22 18:23:48 +02:00
Laurent Destailleur
bbfb93bc42
Merge pull request #13690 from OPEN-DSI/new-societe-import-update-contacts
...
NEW can update contact in import model
2020-04-22 18:09:49 +02:00
Laurent Destailleur
496d8f354f
Look and feel v12
2020-04-22 17:59:54 +02:00
gauthier
43f4c5ac96
FIX : model export list must be sorted by label
2020-04-22 15:29:54 +02:00
Laurent Destailleur
5c133b9c6c
Merge pull request #13686 from frederic34/patch-10
...
add extrafields in note for enstein and azur
2020-04-22 13:19:07 +02:00
Laurent Destailleur
c1d0cae24d
Merge pull request #13692 from hregis/11.0_bug
...
FIX missing fk_bank during export of suppliers invoices
2020-04-22 13:18:46 +02:00
Laurent Destailleur
8754fc1d1e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-22 12:40:21 +02:00
Laurent Destailleur
9a5986e190
css
2020-04-22 12:40:11 +02:00
Regis Houssin
f6f9ca48dd
FIX missing fk_bank during export of suppliers invoices
2020-04-22 12:23:26 +02:00
florian HENRY
8be14060d6
fix: avoid php notice
2020-04-22 12:08:05 +02:00
VESSILLER
cce3085a79
NEW can update contact in import model
2020-04-22 10:44:23 +02:00
Laurent Destailleur
2541d41809
Merge pull request #13669 from pstructures/new-devlelop
...
Add default values to extrafields
2020-04-22 01:06:04 +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
Frédéric FRANCE
8f42707220
Update pdf_crabe.modules.php
2020-04-21 23:20:11 +02:00
Frédéric FRANCE
7972a35e36
Update pdf_azur.modules.php
2020-04-21 23:12:12 +02:00
Frédéric FRANCE
2fde77703d
add extrafields in note for enstein
2020-04-21 23:06:41 +02:00
Laurent Destailleur
770fca0b33
Debug the double language feature in pdf
2020-04-21 20:16:36 +02:00
Laurent Destailleur
042fb4641f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/de_DE/install.lang
htdocs/langs/de_DE/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/projects.lang
2020-04-21 18:33:11 +02:00
Laurent Destailleur
7b99ebfca5
Debug generic translation of fields
2020-04-21 14:54:30 +02:00
Laurent Destailleur
1ef89eb1a1
Fix $mysoc global not loaded.
2020-04-21 14:14:49 +02:00
Laurent Destailleur
ff5bf040e8
FIX text version of html emailing (removed the body style)
2020-04-21 11:19:27 +02:00
mattsidnell
9040c9680d
Removed whitespace
2020-04-20 23:44:23 +01:00
mattsidnell
3f42bfb40f
change
2020-04-20 23:42:12 +01:00
Matt Sidnell
59b574742b
Update commonobject.class.php
2020-04-20 22:52:36 +01:00
Matt Sidnell
ea9f0097a2
Add default values for Create
...
Added default extrafield values for html and text fields to prepopulate data on record create only.
2020-04-20 22:42:13 +01: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
4cd5a1d885
Merge pull request #13661 from frederic34/patch-1
...
remove debug
2020-04-20 16:03:25 +02:00
Laurent Destailleur
67a7d6b77d
Look and feel v12
2020-04-20 15:57:15 +02:00
Frédéric FRANCE
9697085f12
remove debug
2020-04-20 15:36:08 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
Laurent Destailleur
40b3db940c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-20 14:44:36 +02:00
Laurent Destailleur
b90217d860
Merge pull request #13655 from frederic34/patch-4
...
fix indent
2020-04-20 14:38:17 +02:00
Laurent Destailleur
c31fdd26b9
Merge pull request #13654 from frederic34/patch-1
...
Update interface_80_modStripe_Stripe.class.php
2020-04-20 14:35:24 +02:00
Laurent Destailleur
dfd1711f53
Update interface_80_modStripe_Stripe.class.php
2020-04-20 14:35:11 +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
Frédéric FRANCE
7b68a2a60e
Update pdf_crabe.modules.php
2020-04-19 21:50:52 +02:00
Frédéric FRANCE
ca3402c4cf
Update interface_80_modStripe_Stripe.class.php
2020-04-19 21:33:31 +02:00
Laurent Destailleur
7b68d4260c
Fix permission on button
2020-04-19 15:50:32 +02:00
Maxime Kohlhaas
817e16d652
Fix birthdays boxes and filter on month
2020-04-18 20:01:18 +02:00
Laurent Destailleur
ae80b09327
Merge pull request #13598 from atm-maxime/new_fields_on_group
...
New : refactor UserGroup module with new common way
2020-04-18 16:26:58 +02:00
ATM john
e230a3a264
add num row test
2020-04-18 16:24:12 +02:00
ATM john
f2435f6247
Move methods to cunits class
2020-04-18 16:08:26 +02:00
Laurent Destailleur
2f2e3d5057
Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
...
NEW : Extend retained warranty to be available for all invoices
2020-04-18 15:32:33 +02:00
Laurent Destailleur
5c18404083
Move to jquery 4.0.13 with fix in reponsive
...
Restore some files modified by error.
2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867
Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive)
2020-04-18 14:39:02 +02:00
ATM john
395446a924
Add getRows method and comments
2020-04-18 13:44:13 +02:00
ATM john
09591d75f6
Sql write less do more...
2020-04-18 13:20:08 +02:00
ATM john
e915552ae1
New class tool for converting units
2020-04-18 13:12:11 +02:00
Laurent Destailleur
f23266e560
css
2020-04-18 11:40:26 +02:00
Laurent Destailleur
7c6c600225
CSS
2020-04-18 11:38:24 +02:00
Laurent Destailleur
b0515c626b
Look and feel v12
2020-04-18 00:09:24 +02:00
Laurent Destailleur
965bdf733d
FIX Can overwrite file if exists in file manager
2020-04-17 13:10:18 +02:00
Laurent Destailleur
024abe8b58
FIX Preview of svg files into file manager
2020-04-17 12:34:35 +02:00
Laurent Destailleur
162cd94138
FIX Keep sort order after deletion of a file into file manager.
2020-04-17 12:32:05 +02:00
Laurent Destailleur
3e7f0b364e
FIX #13611
2020-04-17 10:22:08 +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
ATM john
3b4b30ea57
Fix merge remaining lines
2020-04-16 20:33:53 +02:00
ATM john
c334a931de
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-16 20:29:54 +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
Laurent Destailleur
26022f062f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-16 15:24:23 +02:00
Laurent Destailleur
984fa0d5a0
Fix hidden const
2020-04-16 15:24:12 +02:00
Laurent Destailleur
1d0b532437
Fix css
2020-04-16 14:31:30 +02:00
Laurent Destailleur
803b0eb3bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-16 12:39:45 +02:00
Laurent Destailleur
dd50083a81
Look and feel v12
2020-04-16 12:39:34 +02:00
Laurent Destailleur
a13215217e
Merge pull request #13604 from TobiasSekan/FixAtomFeeds
...
FIX not working ATOM feeds
2020-04-16 11:58:49 +02:00
Sekan, Tobias
84f7fe24fe
Adress feedback
2020-04-16 10:49:39 +02:00
Laurent Destailleur
6a5b5d77a8
Merge pull request #13615 from pstructures/pstructures-boolean-addupdatedelete
...
Added support for Boolean common field types
2020-04-16 00:52:54 +02:00
Laurent Destailleur
f7803247ab
Merge pull request #13610 from joseplluis/patch-6
...
NEW bank account tags for invoice ODT template
2020-04-16 00:49:17 +02:00
Laurent Destailleur
b540bb29e0
Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status
...
FIX viewstatut to search status
2020-04-16 00:48:12 +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
43ec6c3ae5
Fix phpcs
2020-04-15 23:38:14 +02: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
atm-quentin
f7c07640dd
viewstatut to search_status
2020-04-15 15:01:00 +02:00
Laurent Destailleur
95cf8b6359
FIX Non expected switch from tab timesptent to tab tasks
2020-04-15 14:54:54 +02:00
Matt Sidnell
98ffdfd1c4
Added Boolean Support
...
Added support to convert Boolean from 'on' to 1 in order for compatibility with the common object.
2020-04-15 12:53:39 +01:00
Laurent Destailleur
e26124bf84
Clean code to make option TICKET_NOTIFICATION_EMAIL_TO easier to
...
understand
2020-04-15 12:57:33 +02:00
Maxime Kohlhaas
7fea2bc557
Update changelog + trigger name change for class UserGroup
2020-04-15 08:44:29 +02:00
Laurent Destailleur
6e9cbe5b70
Fix RSS for blogs
2020-04-15 03:32:49 +02:00
Laurent Destailleur
3be426be5b
Align sponge and crabe
2020-04-15 02:24:08 +02:00
Laurent Destailleur
1dd951495b
Removed hard coded dependency on an external module
2020-04-15 02:20:57 +02:00
stickler-ci
c047cd1608
Fixing style errors.
2020-04-14 20:55:58 +00:00
Josep Lluís
d41cb023eb
NEW bank account tags for invoice ODT template
...
added tags object_bank_iban and object_bank_bic, useful for ODT invoices when a bank account is assigned
2020-04-14 22:47:40 +02:00
Laurent Destailleur
c337bd91fe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-14 21:58:13 +02:00
Laurent Destailleur
d143bd8aec
FIX #13589 missing price_level in import of thirdparties
2020-04-14 21:22:08 +02:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Sekan, Tobias
3482d24ee7
Fix not working ATOM feeds
2020-04-14 10:45:52 +02:00
Laurent Destailleur
5772057723
Page to import template easier to understand.
2020-04-13 22:52:34 +02:00
Maxime Kohlhaas
261e6cbc52
Fix delete extrafield test
2020-04-13 19:08:03 +02:00
Maxime Kohlhaas
2e004e93ea
Commonobject : delete extrafields + syslog
2020-04-13 19:02:19 +02:00
Laurent Destailleur
0878ee3a0f
Look and feel v12
2020-04-13 17:55:25 +02:00
Laurent Destailleur
8c8a8263dd
Merge branch 'develop' into patch-145
2020-04-13 16:22:19 +02:00
Laurent Destailleur
99cbb273c8
Update pdf_crabe.modules.php
2020-04-13 16:21:47 +02:00
Laurent Destailleur
76fd1fb105
FIX #12996
2020-04-13 16:13:02 +02:00
Laurent Destailleur
e02ac3b518
Trans
2020-04-13 15:57:25 +02:00
Laurent Destailleur
73f2132dca
Clsoe #13464 Try implementation to allow use of objectonoff for most
...
modules.
2020-04-13 15:13:39 +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
96d087c99d
Fix clean event report
2020-04-13 02:59:33 +02:00
Laurent Destailleur
d0dbf323ed
css
2020-04-13 01:42:10 +02:00
Laurent Destailleur
596ba8d679
Clean deprecated code.
2020-04-13 01:10:35 +02:00
Laurent Destailleur
ae1e4073ad
Debug custom report tool
2020-04-13 00:33:50 +02:00
Laurent Destailleur
8842a1f4e7
css
2020-04-12 23:41:35 +02:00
Laurent Destailleur
d503c1b6be
Fix help
2020-04-12 23:18:21 +02:00
Laurent Destailleur
5b8864b46e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-04-12 21:41:40 +02:00
Laurent Destailleur
384cfeccf6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-04-12 21:38:51 +02:00
Laurent Destailleur
46ccd61009
Fix phpcs
2020-04-12 21:38:23 +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
Laurent Destailleur
0f71ee1e49
Merge pull request #13563 from simicar29/11.0
...
FIX #7594 Expense report multi pagebreak
2020-04-12 18:19:23 +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
08301e2696
Merge pull request #13567 from atm-maxime/new_expensereport_tab_remove
...
Remove expense report tab from user
2020-04-12 17:11:37 +02:00
Laurent Destailleur
422e33a68b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
2020-04-12 17:01:44 +02:00
Laurent Destailleur
697043bbd3
Update html.form.class.php
2020-04-12 16:47:56 +02:00
Laurent Destailleur
acab0200a6
Update html.form.class.php
2020-04-12 16:46:21 +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
Sekan, Tobias
ab870dd532
Switch to new category API in project list view
2020-04-12 13:30:02 +02:00
Laurent Destailleur
6b16a3ad39
NEW Can check all events in one click in setup of audited events
2020-04-12 13:25:19 +02:00
Frédéric FRANCE
b05ea6573e
info categorie
2020-04-12 00:37:05 +02:00
TuxGasy
fecfe2e3a1
Keep compatibility with old object declaration
2020-04-11 18:37:06 +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
Maxime Kohlhaas
2ef787c7ff
Remove expense report tab from user
2020-04-11 17:38:54 +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
simicar29
9573f1289a
FIX #7594
...
This is a temptative fix of the bad "multi page break" in expense report
2020-04-11 13:42:37 +02:00
Laurent Destailleur
d8e0036817
css
2020-04-11 12:41:53 +02:00
Laurent Destailleur
9ab2adab7e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-11 00:56:29 +02:00
Laurent Destailleur
db30f0bbc4
NEW Receipt printer module moved from 'development' to 'experimental'
2020-04-11 00:56:18 +02:00
andreubisquerra
bcbd7632bf
Fix travis
2020-04-10 19:49:59 +02:00
jove@bisquerra.com
66659f0693
Two diferents order printers
2020-04-10 19:18:42 +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
Laurent Destailleur
874cbcefc7
Fix permission to close a proposal or order was not correctly used
...
#13547
2020-04-10 11:54:14 +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
83af4ebea4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/list.php
2020-04-10 01:22:22 +02: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
09f1536c27
Merge pull request #13537 from andreubisquerra/master
...
Add langs and print only no printed order lines
2020-04-09 19:38:30 +02:00
Laurent Destailleur
3c9ca3860b
Merge pull request #13543 from atm-lena/11.0_FIX_hookmanager_typeAddReplace_completeTabsHead
...
FIX - Add function "completeTabsHead" to "addreplace" type hook.
2020-04-09 19:37: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
c83f0f7484
Merge pull request #13533 from simicar29/11.0
...
11.0
2020-04-09 19:34:31 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
Francis Appels
0a8a8bafa0
FIX print pictures in shipment docs
2020-04-09 15:40:36 +02:00
ptibogxiv
5bba22aeeb
FIX pencil with font awesome 5.13
2020-04-09 14:58:42 +02:00
atm-lena
c9ab61b521
FIX - Add function "completeTabsHead" to hooks "addreplace"
2020-04-09 14:54:47 +02:00
Laurent Destailleur
5819aadf75
Clean html code (replace table into table with div)
2020-04-09 13:40:26 +02:00
jove@bisquerra.com
ea79c91482
Add langs and print only no printed order lines
2020-04-08 20:02:54 +02:00
Laurent Destailleur
361baa0c73
CSS
2020-04-08 17:56:24 +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
stickler-ci
e402e35d96
Fixing style errors.
2020-04-08 14:09:04 +00:00
simicar29
6cb780d125
Avoid the doubledot issue in quoted-printable mail
...
When sending HTML mail using swiftmailer, the content will be encoded using quoted-printable. We may then encounter the "double dot" issue (doubled dot at the beginning of the line). This can be problematic with broken links to pictures for example.
This PR switches the encoding to base64.
2020-04-08 16:03:41 +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
d257b5553e
Merge pull request #13351 from TobiasSekan/FixErrorAndSortingInContactView
...
FIX error and sorting in contact view
2020-04-08 15:03:37 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
...
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Laurent Destailleur
711f54846b
Merge pull request #13514 from andreubisquerra/develop
...
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-08 14:49:16 +02:00
Laurent Destailleur
7514aa4612
Merge pull request #13506 from joseplluis/patch-6
...
NEW add professional ID 1 in sepamandate document
2020-04-08 14:40:38 +02:00
Laurent Destailleur
1719647036
Merge pull request #13515 from homer8173/patch-19
...
FIX : twice call in a page
2020-04-08 14:39:28 +02:00
Laurent Destailleur
0716951b6d
Fix logo
2020-04-08 13:38:29 +02:00
Tobias Sekan
91483fd560
Add optional remove action for showDocuments
2020-04-08 10:24:32 +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
Norbert Penel
a5f39e996d
FIX : twice call in a page
...
fix to let this function be used twice in a page
2020-04-07 09:27:55 +02:00
Laurent Destailleur
ff1b3db54b
Fix regression on hamburger picto
2020-04-06 23:38:30 +02:00
andreubisquerra
5707bf0d73
NEW RECEIPT_PRINTER_NB_CHARACT_BY_LINE and FIX product label
2020-04-06 19:38:50 +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
082b205149
WIP Work on Kanban view for module list
2020-04-06 15:12:42 +02:00
stickler-ci
3b9267fd8a
Fixing style errors.
2020-04-06 10:51:06 +00:00
Josep Lluís
35f3052280
NEW add VAT ID in sepamandate document
...
add: VAT ID in sepamandate document
2020-04-06 12:47:57 +02:00
Laurent Destailleur
41b2ed8f89
Look and feel v12
2020-04-06 12:03:37 +02:00
Laurent Destailleur
4f8b3e0646
Fix name of cookie
2020-04-06 10:02:11 +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
ed4aa55857
Doxygen
2020-04-05 15:46:10 +02:00
Laurent Destailleur
47987f239d
Fix trans
2020-04-05 15:42:39 +02:00
Laurent Destailleur
009cc36355
Fix sendocntext for builk action
2020-04-05 15:39:53 +02:00
Laurent Destailleur
e32ac7644d
FIX Send email from bulk action of list of thirdparties
2020-04-05 15:31:18 +02:00
Laurent Destailleur
0215ef9e76
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:29:24 +02:00
Laurent Destailleur
62387f712c
FIX Send email from bulk action of list of thirdparties
2020-04-05 15:26:16 +02:00
Laurent Destailleur
233a7f1022
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 12:24:27 +02:00
Laurent Destailleur
bfbc9b303a
Fix phpcs
2020-04-05 12:23:16 +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
Laurent Destailleur
b1c5490a74
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_add.tpl.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
2020-04-05 04:03:53 +02:00
Laurent Destailleur
b6a0432589
Merge pull request #13495 from atm-maxime/new_report_supplier_turnover
...
New report supplier turnover
2020-04-05 03:19:18 +02:00
Laurent Destailleur
165df931f1
Complete fix #13491
2020-04-05 03:14:12 +02:00
Laurent Destailleur
22a8c207f4
Merge pull request #13491 from atm-lena/11.0_FIX_Ticket_ExtrafieldsVisibility_4
...
FIX 11.0 Ticket - Visibility 4, don't display extrafields at the creation
2020-04-05 02:54:41 +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
a41f54c82f
Fix css
2020-04-05 02:39:40 +02:00
Laurent Destailleur
647d09050b
Clean not required vars
2020-04-04 19:25:36 +02:00
Maxime Kohlhaas
79e5099c6d
Add menu entries
2020-04-04 18:45:33 +02: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
e6641b5369
Fix doc
2020-04-03 18:01:54 +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
atm-lena
bc0d98b91c
FIX 11.0 Ticket Module - Visibility 4, don't display extrafields at the creation
2020-04-03 14:24:59 +02:00
Laurent Destailleur
f7b6895dc6
Fix option to not generate doc in modulebuilder.
2020-04-03 14:02:37 +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
87d46c4e86
Merge pull request #13473 from nervo/patch-1
...
NEW [Allow constants values to be overridden by environment variables]
2020-04-02 13:33:47 +02:00
Laurent Destailleur
7ad67ff91d
Merge pull request #13462 from atm-florian/11.0
...
fix advtargetemailing : fatal call to static attribut (table_element is not a static attribut)
2020-04-02 13:05:12 +02:00
Laurent Destailleur
967a6accee
Merge pull request #13461 from oscim/patch-32
...
NEW Add company extrafields into order export
2020-04-02 12:57:05 +02:00
Laurent Destailleur
9f55918cb8
Remove Geoipv1 library. We use now v2
2020-04-02 12:37:21 +02:00
Laurent Destailleur
84cda962c1
Clean dead code
2020-04-02 12:03:29 +02:00
Laurent Destailleur
f6b216eafc
Fix travis
2020-04-01 23:32:44 +02:00
Laurent Destailleur
6aea67a5b9
Work on extralanguages
2020-04-01 23:15:53 +02:00
stickler-ci
cf3615aee3
Fixing style errors.
2020-04-01 20:11:18 +00:00
nervo
abd6465190
Allow constants values to be overridden by environment variables
2020-04-01 22:02:34 +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
33d2b61c19
Work on extralanguages
2020-04-01 16:21:03 +02:00
Laurent Destailleur
b407797ca3
Fix css
2020-03-31 17:45:45 +02:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
Laurent Destailleur
e75e49426f
Look and feel v12
2020-03-31 13:52:02 +02:00
florian HENRY
5658d783d6
fix advtargetemailing : fatal call to static attribut (that is not static: table_element)
2020-03-31 12:04:34 +02:00
oscim
3b8a16e3fd
Update modCommande.class.php
...
add extrafileds company in export orders
2020-03-31 11:05:21 +02:00
Laurent Destailleur
416d1ce3f0
Fix phpcs
2020-03-31 00:11:31 +02:00
Laurent Destailleur
0b7b97ec34
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-30 19:43:03 +02:00
Laurent Destailleur
efaea37d61
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +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
4220236aa8
Merge pull request #13425 from andreubisquerra/develop
...
NEW: CUPS printing compatibility for TakePOS
2020-03-30 18:56:14 +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
oscim
d760b6618d
Fix use correctly hosts in connection
...
cf https://github.com/Dolibarr/dolibarr/issues/9426
2020-03-30 18:27:18 +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
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check
...
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
2020-03-30 10:24:42 +02:00
Laurent Destailleur
5fad4c8cb4
CSS
2020-03-29 19:41:01 +02:00
Laurent Destailleur
4ed4644c08
Work on generic multilanguage properties
2020-03-29 04:28:23 +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
b33552fb6f
Fix phpcs
2020-03-27 16:13:53 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
Laurent Destailleur
354cb8c1b0
Work on Kanban view for modules
2020-03-27 01:59:17 +01:00
Laurent Destailleur
9379f6fa9d
Fix duplicate tooltip
2020-03-26 20:27:49 +01:00
Laurent Destailleur
a02e3e1e61
Fix duplicate tooltip
2020-03-26 20:05:17 +01:00
Laurent Destailleur
4a012c13b2
FIX Translation of tooltips of extrafields
2020-03-26 19:47:28 +01:00
Laurent Destailleur
2f94db6ffe
FIX Translation of tooltips of extrafields
2020-03-26 19:46:36 +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
5a5863f46a
FIX Group by invalid with pgsql
2020-03-26 03:55:34 +01:00
Laurent Destailleur
fa3bba942f
Start to save the VAT src code into table of discounts to reuse them
...
later
2020-03-26 02:01:30 +01:00
Laurent Destailleur
ab19bb2455
FIX default value of selectMasssAction broken
2020-03-26 01:25:05 +01:00
Laurent Destailleur
90e0ead953
FIX default value of selectMasssAction broken
2020-03-26 00:52:05 +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
andreubisquerra
eef3a1795e
Update dolreceiptprinter.class.php with CUPS
2020-03-25 21:30:33 +01:00
Laurent Destailleur
51f8c5ca87
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/expensereport/list.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
2020-03-25 19:01:56 +01:00
Laurent Destailleur
7c819a96d5
Merge pull request #13415 from ptibogxiv/patch-314
...
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
2020-03-25 18:32:57 +01:00
Laurent Destailleur
0a92dcc5e6
Merge pull request #13413 from atm-florian/develop
...
fix extrafield creation with empty printable
2020-03-25 18:31:28 +01:00
Laurent Destailleur
925554d15e
More accurate result
2020-03-25 18:27:53 +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
VESSILLER
c516a54f78
FIX get remain to pay with rounding decimals
2020-03-25 11:53:47 +01:00
Alexandre SPANGARO
5528e9ef38
Work on split module fournisseur
2020-03-24 22:02:58 +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
ptibogxiv
06f53fdd69
Update html.form.class.php
2020-03-24 17:32:50 +01:00
ptibogxiv
8409f3ba4e
NEW PRODUCT_SHOW_ORIGIN_IN_COMBO
...
for some business, products have same label so we sometimes need display origin of product for a good choice
2020-03-24 17:28:12 +01:00
gauthier
4c0de74470
FIX : sort by default role makes no sense
2020-03-24 16:27:53 +01:00
florian HENRY
21febcc8fc
fix extrafeild creation
2020-03-24 16:09:18 +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
db6cb2d449
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-23 15:34:03 +01:00
Laurent Destailleur
24dc202022
Doc
2020-03-23 15:33:52 +01:00
Laurent Destailleur
e4a9763f54
Merge pull request #13405 from aspangaro/12.0_a25
...
Qual: Move supplier proposal menu to the core
2020-03-23 15:17:10 +01:00
Laurent Destailleur
2177afecd9
Sort order
2020-03-23 14:12:48 +01:00
Alexandre SPANGARO
89de39f199
Move supplier proposal menu to the core
2020-03-23 08:51:38 +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
94b6fbb223
FIX #13300
2020-03-22 20:52:00 +01:00
Laurent Destailleur
26e9500c26
FIX #13300
2020-03-22 20:50:50 +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
700e384639
WIP Edit fields into alternate language
2020-03-22 19:11:21 +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
b613769606
Work on split module fournisseur
2020-03-22 06:09:47 +01:00
Alexandre SPANGARO
c05ef16e0b
Work on split module fournisseur
2020-03-22 05:51:14 +01:00
Alexandre SPANGARO
6e9a07d119
Work on split module fournisseur
2020-03-22 05:33:30 +01:00
Laurent Destailleur
bcf17c79ef
FIX closing tags
2020-03-22 02:44:00 +01:00
Laurent Destailleur
c8b05036a4
Prepare notif using the notif table
2020-03-22 01:24:50 +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
0574e1df9f
Merge pull request #13386 from aspangaro/12.0_a24
...
FIX: Load the translation file for extrafields
2020-03-20 10:05:41 +01:00
Laurent Destailleur
5ffc57f3f0
Update extrafields.class.php
2020-03-20 10:05:08 +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
03b261d54c
Provide information of thirdparty, contact or project to SMS handler
2020-03-19 19:11:34 +01:00
Laurent Destailleur
c71da5d013
FIX mass action on stock movements
2020-03-19 15:43:06 +01:00
Laurent Destailleur
7eb4522636
FIX missing token and save of survey description
2020-03-19 11:59:57 +01:00
Alexandre SPANGARO
a6227aeb6a
FIX: Load the translation file for extrafields
2020-03-19 11:53:42 +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
fca6d45baa
NEW Overwrite tpl with module_part['tpl'] is deprecated. USe hooks
...
instead.
2020-03-19 10:15:34 +01:00
Laurent Destailleur
c94c33696a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-19 09:58:04 +01:00
Laurent Destailleur
d38c6616e6
Doc
2020-03-19 09:53:20 +01:00
Laurent Destailleur
21de447d9e
Merge pull request #13349 from TobiasSekan/AddSubstitutForUserCivility
...
NEW "contact_civility" for ODT templates
2020-03-18 19:31:10 +01:00
Laurent Destailleur
8fa505422e
Merge pull request #13378 from atm-florian/develop
...
NEW: Export module, add extrafields for Contract and Contract line
2020-03-18 19:27:24 +01:00
Laurent Destailleur
87edf27bbf
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV
2020-03-18 19:12:52 +01:00
Laurent Destailleur
2c3bd78095
Merge pull request #13353 from FHenry/dev_addHookOnSelectUserORSalesRep
...
new : Add hook on select user or sales rep
2020-03-18 18:56:56 +01:00
Laurent Destailleur
3f4a7b2387
Merge pull request #13350 from TobiasSekan/FixMissingUserInOdtSupProposal
...
FIX missing "contact_" substitution in supplier proposal (ODT template)
2020-03-18 18:55:03 +01:00
Laurent Destailleur
3b1c02ae46
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-18 18:51:05 +01:00
Laurent Destailleur
8bab245c7e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
a3328c5ef3
Fix div
2020-03-18 18:37:44 +01:00
Laurent Destailleur
e639e24993
Merge pull request #13352 from aspangaro/12.0_a22
...
FIX Update fiscalyear.class.php to filter on entity
2020-03-18 18:19:02 +01:00
florian HENRY
15614abc3f
NEW: add csv separator setup in module admin
2020-03-18 15:08:58 +01:00
Laurent Destailleur
cc93a40c45
Fix label of local tax
2020-03-18 14:06:15 +01:00
florian HENRY
50a0bfef64
NEW: Export module, add extrafields for Contract and Contract line
2020-03-18 09:53:13 +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
94750ed350
css
2020-03-17 01:31:48 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
4b1dd27c5f
Move takepos.php file into index.php to match other dir structure
2020-03-16 15:41:21 +01:00
Alexandre SPANGARO
6b168428d8
Merge remote-tracking branch 'upstream/develop' into 12.0_a22
2020-03-16 12:11:01 +01:00
florian HENRY
ef83801a53
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_addHookOnSelectUserORSalesRep
2020-03-16 11:53:49 +01:00
florian HENRY
117ff5f4eb
add hook to add sql filter in where clause on select users
2020-03-16 11:49:03 +01:00
Alexandre SPANGARO
301b97f6d2
FIX Update fiscalyear.class.php to filter on entity
2020-03-16 10:05:22 +01:00
Tobias Sekan
79caae9123
fix wrongly remoived center attributes
2020-03-16 09:59:58 +01:00
stickler-ci
711aff9ff7
Fixing style errors.
2020-03-16 08:56:10 +00:00
Tobias Sekan
41c0575a5d
Fix not working sorting in contact view
2020-03-16 09:51:12 +01:00
stickler-ci
fd4e807211
Fixing style errors.
2020-03-16 07:40:10 +00:00
Tobias Sekan
debecabe69
FIX missing "contact_" substitution in supplier proposal
2020-03-16 08:38:01 +01:00
Tobias Sekan
c50f2b32d8
Add substitution for "user_civility" for ODT
2020-03-16 07:58:44 +01:00
Laurent Destailleur
22e8fdb46b
Enhance #13033
2020-03-15 13:57:31 +01:00
Laurent Destailleur
aef827f826
Alias on same line than name
2020-03-14 14:47:01 +01:00
Laurent Destailleur
37fce0d3ee
Fix position on merou
...
Fix preselected value on contact
2020-03-14 14:45:37 +01:00
Laurent Destailleur
f92943bee2
css
2020-03-14 03:24:46 +01:00
Laurent Destailleur
0d2d2302d5
Removed not relevant graph on stats on project
2020-03-14 03:18:49 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
...
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
99669583d5
Fix phpcs
2020-03-13 16:46:07 +01:00
Laurent Destailleur
d90bf25351
Fix phpcs
2020-03-13 13:11:04 +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
893ae21d3a
Fix phpcs
2020-03-13 11:29:27 +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
VESSILLER
826ed67921
FIX travis errors sql escape
2020-03-13 09:01:22 +01:00
Laurent Destailleur
6dda972ff5
Doxygen
2020-03-13 04:12:42 +01:00
Laurent Destailleur
94589158c0
Move class from external project as internal class (project is dead)
2020-03-13 02:32:33 +01:00
VESSILLER
04c0332bee
FIX travis errors
2020-03-12 18:31:43 +01:00
VESSILLER
1379b2ce87
FIX travis errors
2020-03-12 18:21:44 +01:00
VESSILLER
70ebc61c1f
Module TakePos - NEW add numbering module for cash desk
2020-03-12 17:43:59 +01:00
Laurent Destailleur
09359b8025
Merge pull request #13338 from altatof/box_shipments
...
FIX : missing class declaration
2020-03-12 17:06:50 +01:00
Laurent Destailleur
967d4223c6
FIX #13277
2020-03-12 16:15:48 +01:00
altairis
6618205e6f
fix missing class declaration
2020-03-12 15:05:32 +01:00
simicar29
4f4b778c8c
update_price: add invoice_supplier element name
...
'invoice_supplier' as an element name was missing in test conditions to skip the update_price function
2020-03-12 12:53:17 +01:00
stickler-ci
aaf1081f17
Fixing style errors.
2020-03-12 11:46:41 +00: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
ad22820872
FIX #13313
2020-03-12 12:15:44 +01:00
Laurent Destailleur
e7ce9c16cb
FIX #13313
2020-03-12 12:15:16 +01:00
Laurent Destailleur
c1e5178eeb
Doc
2020-03-12 12:01:40 +01:00
Laurent Destailleur
d6a35db754
Look and feel v12
2020-03-12 11:13:50 +01:00
Laurent Destailleur
a6f8608ffd
Fix when undefined key
2020-03-12 11:09:18 +01:00
Laurent Destailleur
af227ae164
Add picto on selection of terminal button
2020-03-11 23:57:36 +01: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
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
...
NEW : Allow extrafields on pdf : extend to line desc
2020-03-11 17:12:14 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
...
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00
Laurent Destailleur
4903287204
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/boxes/box_commandes.php
htdocs/fourn/class/fournisseur.commande.class.php
2020-03-11 17:04:28 +01:00
Laurent Destailleur
21dbddac76
Merge pull request #13317 from TobiasSekan/FixErrorOnAddLineToOrder
...
FIX Error on add a new line to a supplier order (with ODT templates)
2020-03-11 16:58:44 +01:00
Laurent Destailleur
7e574e0429
Fix permissions
2020-03-11 16:47:42 +01:00
Laurent Destailleur
ae5d94b01c
Merge pull request #13323 from aspangaro/11.0_p5
...
Fix accounting files link on auguria menu
2020-03-11 16:43:10 +01:00
Laurent Destailleur
13ffc186b7
Merge pull request #13324 from atm-florianm/FIX_10.0_status_column_empty_in_invoices_box_when_using_MAIN_STATUS_USES_CSS
...
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
2020-03-11 16:41:24 +01:00
Laurent Destailleur
8808b7df87
Merge pull request #13325 from atm-florianm/FIX_10.0_load_langs_in_box_commandes
...
FIX 10.0 - missing translations for "orders" homepage "orders" box
2020-03-11 16:39:43 +01:00
Laurent Destailleur
25eae4db9c
Fix missing __USER_EMAIL__ substitution
2020-03-11 16:28:00 +01:00
Laurent Destailleur
2b8a06cb5e
FIX unit price for selected supplier products not set. NaN was used.
2020-03-11 16:12:34 +01:00
Laurent Destailleur
5adec1fe32
FIX unit price for selected supplier products not set. NaN was used.
2020-03-11 16:11:38 +01:00
Laurent Destailleur
26fec2f366
Enhance website
2020-03-11 12:53:41 +01:00
Florian Mortgat
ce01cf278d
FIX 10.0 - translations for "orders" not loaded in the homepage box
2020-03-11 11:45:57 +01:00
Florian Mortgat
6d1f62c1d9
FIX 10.0 - status missing from last customer invoices box when using MAIN_STATUS_USES_CSS
2020-03-11 11:03:19 +01:00
Alexandre SPANGARO
f2b33c0d77
Fix accounting files link on auguria menu
2020-03-11 06:20:25 +01:00
Laurent Destailleur
1f5c8f682c
FIX cols parameter not propagated to tpl
2020-03-10 21:55:29 +01:00
Laurent Destailleur
d956222e36
FIX cols parameter not propagated to tpl
2020-03-10 21:54:50 +01:00
Tobias Sekan
60944c92a8
Fix error on add a line to a supplier order
2020-03-10 09:02:38 +01:00
Laurent Destailleur
cc1a02f0ea
Support of null values in graph
2020-03-09 22:52:30 +01:00
Laurent Destailleur
e1c7222172
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-09 20:39:05 +01:00
Laurent Destailleur
99b1c773a7
FIX link when using anchor on "/"
2020-03-09 18:56:52 +01:00
Laurent Destailleur
86f6736a18
Fix phpcs
2020-03-09 18:55:47 +01:00
Laurent Destailleur
e536ee87b8
FIX link when using anchor on "/"
2020-03-09 18:54:34 +01:00
Laurent Destailleur
ca4c62be56
Fix var init
2020-03-09 13:56:25 +01:00
Laurent Destailleur
84606f29c0
Trans
2020-03-09 09:14:25 +01:00
Laurent Destailleur
1fb6d1d43d
FIX menu export document was not visible when using "simple accounting"
2020-03-08 20:49:50 +01:00
Laurent Destailleur
067759bf04
Fix graph for lines
2020-03-08 20:22:46 +01:00
Laurent Destailleur
3edc3dd382
Fix fields definition
2020-03-08 20:10:31 +01:00
Laurent Destailleur
343a80fd3d
Fix table fields
2020-03-08 19:25:00 +01:00
Laurent Destailleur
fefb3fdde7
Fix permissions on restricArea for external modules
2020-03-08 18:26:41 +01:00
Laurent Destailleur
6424e50ba4
Enhance of colors in graph
2020-03-07 16:45:28 +01:00
Laurent Destailleur
44a611e006
Move getElementProperties and fetchObjectByElement into functions
2020-03-07 15:06:14 +01:00
Laurent Destailleur
e5bb6615b2
Fix remove warning
2020-03-06 20:06:56 +01:00
Laurent Destailleur
e6f68b9a29
Fix correct 'group by' when content is '0', '' or null
2020-03-06 20:02:05 +01:00
Jean Traullé
7c2bed2846
Fix #13296
2020-03-06 16:22:41 +00:00
Laurent Destailleur
d812249047
Move code into functions
2020-03-06 17:13:51 +01:00
Laurent Destailleur
cdec58a527
Clean old code
2020-03-06 15:05:18 +01:00
Laurent Destailleur
d0f22c7bff
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/boxes/box_graph_product_distribution.php
2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/core/lib/functions.lib.php
2020-03-06 14:19:30 +01:00
Laurent Destailleur
0b8adbfc55
Merge pull request #13289 from atm-greg/Fix_countable_warning_on_homescreen
...
fix countable warning on home screen
2020-03-06 14:13:24 +01:00
Laurent Destailleur
dc0e96a6e5
Fix scrutinizer
2020-03-06 14:09:00 +01:00
Laurent Destailleur
ad9d0a3472
Fix graph of product distribution when too much record
2020-03-06 12:45:02 +01:00
Laurent Destailleur
5ff4b638a5
FIX empty of series in graph of product distribution
2020-03-06 12:00:40 +01:00
Laurent Destailleur
8e9d4e408f
FIX empty of series in graph of product distribution
2020-03-06 11:59:06 +01:00
Laurent Destailleur
e2396919d4
FIX chart of product distribution
2020-03-06 11:52:32 +01:00
atm-greg
eafff58a54
fix countable warning
2020-03-06 11:30:45 +01:00
Laurent Destailleur
c27f90958e
Code comment
2020-03-06 11:06:07 +01:00
Laurent Destailleur
4c6a4ade5b
Log
2020-03-06 11:02:40 +01:00
Laurent Destailleur
47ebc2bbf2
Hide legend
2020-03-06 09:52:51 +01:00
Laurent Destailleur
ea658ebe72
Fix setShowLegend with chartjs
2020-03-06 09:51:30 +01:00
Laurent Destailleur
201f9badeb
elseif
2020-03-06 09:22:21 +01:00
Laurent Destailleur
f9546fc50e
Fix dolgraph
2020-03-06 09:21:04 +01:00
Laurent Destailleur
e8407e3f0b
Merge pull request #13283 from OPEN-DSI/10.0
...
FIX substitute lines dates values on doc generator (ODT, ...)
2020-03-06 09:19:50 +01:00
Laurent Destailleur
32ee3122ac
More accurate code
2020-03-06 02:24:24 +01:00
Laurent Destailleur
0ba2c53b02
Fix translation of graph
2020-03-06 01:42:42 +01:00
Laurent Destailleur
7b5f9e1b11
Fix graph
2020-03-06 01:29:59 +01:00
Laurent Destailleur
52c236570b
Work on the generic Graphic Reporting tool
2020-03-06 01:18:35 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
ddb26d7a8f
NEW Add graph type 'piesemicircle'
2020-03-05 16:30:55 +01:00
kamel
0123fa7696
FIX subsitute lines dates values on doc generator (ODT, ...)
2020-03-05 15:37:01 +01:00
Laurent Destailleur
fc31680bd0
Several fix for chart.js graphs
2020-03-05 02:55:06 +01:00
Laurent Destailleur
f35f0ecf9d
Look and feel v12
2020-03-05 01:54:12 +01:00
Laurent Destailleur
45bcd1c3bf
Code simpler
2020-03-05 01:50:53 +01:00
Laurent Destailleur
74fa8d90e7
Use status of member colors into pie chart
2020-03-05 01:38:41 +01:00
Laurent Destailleur
a98b65ad99
FIX #13274 cannot add or update 0 value for an int or double extrafield
...
type
2020-03-05 00:43:51 +01:00
Laurent Destailleur
c2e5830f9b
Fix phpcs
2020-03-05 00:22:51 +01:00
Laurent Destailleur
a5a2d60755
Fix phpcs
2020-03-05 00:20:39 +01:00
Laurent Destailleur
aa1552dbc0
Enhance graphs
2020-03-05 00:17:16 +01:00
Laurent Destailleur
d0839350db
NEW Move engine to build charts from jflot to chart.js
2020-03-04 23:30:41 +01:00
Laurent Destailleur
0766097658
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-04 19:28:24 +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
stickler-ci
92cc947623
Fixing style errors.
2020-03-04 12:41:52 +00:00
Tobias Sekan
f823feba52
Add sorting for "Contacts of ..."
2020-03-04 13:31:19 +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
50d76ae0e8
FIX Bad permission to access menu Statistics on intervention.
2020-03-04 11:51:32 +01:00
Laurent Destailleur
2b65dff8a2
FIX Bad permission to access menu Statistics on intervention.
2020-03-04 11:48:43 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
5f417039f6
More log to help debug
2020-03-04 00:38:43 +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
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Anthony Berton
2fd7276a30
Update functions.lib.php
2020-03-03 09:53:00 +01:00
Laurent Destailleur
760afd6838
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 23:28:12 +01:00
Laurent Destailleur
481ea6296e
No more need fo this constant. Use the generic default feature instead
2020-03-02 23:28:01 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
...
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
Laurent Destailleur
ea7c2aa46b
Update functions.lib.php
2020-03-02 21:47:36 +01:00
Laurent Destailleur
6d01aee2f2
Merge pull request #13246 from Dolibarr/11.0
...
Can process lang files with windows format (even if all lang files must have linux format)
2020-03-02 21:46:27 +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
Regis Houssin
e962afb9c5
FIX modFournisseur is required by modSupplierProposal
2020-03-02 14:10:37 +01:00
Sekan, Tobias
f325c63055
Merge branch 'NewCategoriesInStocks' of https://github.com/TobiasSekan/dolibarr into NewCategoriesInStocks
2020-03-01 14:50:27 +01:00
Sekan, Tobias
754058b990
Fix lint errors
2020-03-01 14:50:22 +01:00
stickler-ci
a6b2531fd0
Fixing style errors.
2020-03-01 13:46:49 +00:00
Sekan, Tobias
0e55495c3e
adress feedback
2020-03-01 14:45:51 +01:00
Alexandre SPANGARO
6982997de5
Fix error
2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +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
bb5b55f9e3
Merge pull request #13225 from prietojc/patch-13
...
Update translate.class.php
2020-02-29 12:58:32 +01:00
Laurent Destailleur
f0d2f33e38
Merge pull request #13231 from defrance/patch-148
...
FIX: checkbox fields not updated when unchecked
2020-02-29 12:54:25 +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
00483e4e85
NEW Add hook getInputIdProf. Better solution for #13228
2020-02-29 12:32:27 +01:00
Laurent Destailleur
dea8525a6c
NEW X-Axis on graph are show vertical when there is a lot of values.
2020-02-29 01:26:24 +01:00
Laurent Destailleur
f0d458682d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 00:15:17 +01:00
Laurent Destailleur
e35bba358f
Fix error when generating documents
2020-02-29 00:13:42 +01:00
Laurent Destailleur
acb3fb2cd8
Fix extrafields on x-axis
2020-02-29 00:11:19 +01:00
Laurent Destailleur
c6b6b97ac0
FIX Free input for email no more visible
2020-02-28 20:25:17 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
stickler-ci
89048ca52e
Fixing style errors.
2020-02-28 14:49:10 +00:00
BENKE Charlene
50b3c760dd
Update actions_addupdatedelete.inc.php
2020-02-28 15:47:26 +01:00
BENKE Charlene
477cce718b
checkbox not updated when unchecked
...
GETPOSTISSET return false in this case and the value is not updated
2020-02-28 15:29:12 +01:00
Laurent Destailleur
e07a29ecd0
Fix class not found
2020-02-27 22:02:45 +01:00
Laurent Destailleur
2d841d9d83
Debug multilang website
2020-02-27 21:43:11 +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
Laurent Destailleur
baaa6b797b
FIX SQl syntax error
2020-02-27 17:51:31 +01:00
Laurent Destailleur
a0b465e8ae
Fix sql error
2020-02-27 17:43:59 +01:00
Laurent Destailleur
eac07aceb0
Responsive
2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
6d728f12ba
NEW: invoice list: enable multicurrency columns
2020-02-27 14:10:00 +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
JC Prieto
c555a2c588
Update translate.class.php
...
Resolve bug #9105
When load() function loads translation file from an external modules, adds a \r simbol at the end of each line.
2020-02-27 09:32:22 +01:00
Laurent Destailleur
9bc5eb44ca
FIX #13182
2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ab01acfe53
Merge pull request #13211 from ATM-Marc/FIX_11.0_excess_paid_from_situation_invoice
...
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 16:30:20 +01:00
Laurent Destailleur
9c1c0ee08f
Fix for nojs interface
2020-02-26 16:17:31 +01:00
Laurent Destailleur
b52cfe58d6
FIX Disable js if no javascript
2020-02-26 15:45:12 +01:00
Laurent Destailleur
35e886fb12
FIX Disable js if no javascript
2020-02-26 15:22:23 +01:00
Marc de Lima Lucio
d3b70994fe
Merge branch 'FIX_8.0_excess_paid_from_situation_invoice' of github.com:ATM-Marc/dolibarr into FIX_11.0_excess_paid_from_situation_invoice
2020-02-26 10:42:55 +01:00
Marc de Lima Lucio
373ab3bc01
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 10:35:43 +01:00
atm-quentin
a5baf2bc88
FIX search with '0'
2020-02-26 09:19:39 +01:00
Laurent Destailleur
b7b2d3562b
Merge pull request #13195 from oscim/patch-24
...
Update commonobject.class.php
2020-02-26 05:14:27 +01:00
Laurent Destailleur
39624f21e7
Fix var not always defined
2020-02-25 15:36:34 +01:00
Laurent Destailleur
d172a95dfe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-25 14:37:04 +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
59137f0f47
Merge pull request #13190 from oscim/patch-23
...
Update commonobject.class.php
2020-02-25 12:05:22 +01:00
Laurent Destailleur
75cddcd2de
Merge pull request #13193 from TobiasSekan/NewLinePosOdtTemplate
...
NEW Support of tag {line_pos} for line numbers for tables in ODT templates
2020-02-25 00:05:01 +01:00
Laurent Destailleur
2a6652f6b5
Merge pull request #13192 from atm-florian/11_fixcomumnRUMMissingintoImport
...
fix missing column into Bank import
2020-02-24 22:55:47 +01:00
ATM john
c216b7cae5
fix title padding definition source
2020-02-24 22:34:34 +01:00
ATM john
7b6faf7063
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 22:16:10 +01:00
ATM john
9c1fdf1c52
Fix missing php doc
2020-02-24 22:12:36 +01:00
stickler-ci
5a77716b93
Fixing style errors.
2020-02-24 21:10:14 +00:00
ATM john
3e492b8a5b
Fix title padding
2020-02-24 22:08:04 +01:00
ATM john
ae890d021c
Fix comments
2020-02-24 21:50:01 +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
ATM john
7f2dd19bb0
Fix pdf cell padding for model cyan, erathosthene, espadon, cornas
2020-02-24 21:43:33 +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
stickler-ci
6de74e774e
Fixing style errors.
2020-02-24 19:50:07 +00:00
ATM john
3c4e7f7b07
Fix cell padding sponge
2020-02-24 20:47:19 +01:00
Laurent Destailleur
9d9429f66b
New: Can limit number of tabs by page.
2020-02-24 20:41:29 +01:00
oscim
65f3e5466e
Update commonobject.class.php
...
add path class for support type project or projet in element_element
2020-02-24 17:51:11 +01:00
John Botella
11b6cae4f1
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 17:48:42 +01:00
John Botella
1ca1f0677b
fix PDF cell padding
2020-02-24 17:48:01 +01:00
stickler-ci
d07e2ab8fb
Fixing style errors.
2020-02-24 16:44:46 +00:00
oscim
fe4bd46c43
Update commonobject.class.php
...
add support of contact linkedobject
2020-02-24 17:28:25 +01:00
florian HENRY
9f8166ed37
fix missing column into import
2020-02-24 15:14:01 +01:00
florian HENRY
b2b2291117
fix missing column into import
2020-02-24 15:12:26 +01:00
florian HENRY
2c26ddb22b
fix missing column into import
2020-02-24 15:11:14 +01:00
Tobias Sekan
2d9300cedb
Add position to ODT supplier_proposal template
2020-02-24 15:06:21 +01:00
Tobias Sekan
fc76586e2f
Add position to ODT supplier order template
2020-02-24 15:05:04 +01:00
Tobias Sekan
1f2203f0d6
Add position to ODT propale template
2020-02-24 15:04:02 +01:00
Tobias Sekan
933b46790a
Add position to ODT mo template
2020-02-24 15:02:11 +01:00
Tobias Sekan
7469aa1f35
Add position to ODT invoice template
2020-02-24 15:00:37 +01:00
Tobias Sekan
cdbe6c1e81
Add position to ODT contract template
2020-02-24 14:59:20 +01:00
Tobias Sekan
b29d8e53ed
Add position to ODT order template
2020-02-24 14:58:01 +01:00
Tobias Sekan
4a5593e213
Add position to ODT for bom
2020-02-24 14:56:26 +01:00
Tobias Sekan
7baba2ba43
Add line number substitution
2020-02-24 14:55:02 +01:00
John Botella
06b2d459c0
Fix cell padding
2020-02-24 14:18:49 +01:00
oscim
6c7a534018
Update commonobject.class.php
...
Add support of project/projet in objectlinked
2020-02-24 11:49:12 +01:00
Laurent Destailleur
58ebad4b15
Fix trans
2020-02-24 07:20:36 +01:00
Laurent Destailleur
8ebc157316
Test color magenta for titles
2020-02-24 06:55:08 +01:00
Laurent Destailleur
32d12468cf
Use SVG logo instead of png
2020-02-24 06:27:03 +01:00
Laurent Destailleur
3682d9143e
Fix showing bank account on PDF
2020-02-24 04:55:44 +01:00
Laurent Destailleur
150d4d33f6
Fix showing bank account on PDF
2020-02-24 04:55:09 +01:00
Laurent Destailleur
6366881f91
FIX #13175
2020-02-24 00:41:25 +01:00
ATM john
13790422dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-24 00:18:37 +01:00
ATM john
377b9a6b88
Add extrafields on PDF object lines desc for compatible pdf
2020-02-24 00:14:43 +01:00
ATM john
41c18a7884
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 00:01:50 +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
stickler-ci
fab34d5114
Fixing style errors.
2020-02-23 22:40:41 +00: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
ATM john
0c2d08cdd9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-23 23:36:43 +01:00
Laurent Destailleur
5919570b34
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-23 23:31:51 +01:00
Laurent Destailleur
11ff3f6562
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-23 23:31:03 +01:00
Laurent Destailleur
ee45c3efb6
FIX #13184
2020-02-23 23:29:13 +01:00
ATM john
acacbfd85e
Fix list separator on first loop
2020-02-23 23:17:10 +01:00
ATM john
316fa4068a
revert commit fdfc45bbe9 and fix y position
2020-02-23 23:14:01 +01:00
ATM john
5ecef88b35
allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields
2020-02-23 23:04:24 +01:00
Laurent Destailleur
ca39c680c7
Rename field documentpdf into printable (this field already exists due
...
to a very old PR nofinished for same goal).
2020-02-23 23:03:17 +01:00
Laurent Destailleur
90565e4637
Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf
...
NEW allow display extrafields on pdf
2020-02-23 22:55:16 +01:00
Laurent Destailleur
cac61c223d
Merge pull request #13176 from andreubisquerra/master
...
Add orders to Receipt Printer module
2020-02-23 22:44:14 +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
76e33058a8
NEW Can select several fields to personalize list before submit.
2020-02-23 21:38:24 +01:00
ATM john
93c9f07cb9
Fix note x position
2020-02-23 20:59:04 +01:00
ATM john
f611e4fc0e
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 20:53:50 +01:00
ATM john
07bd6e1fc0
Fix On admin page add extrafields form, display on pdf option doesn't saved
2020-02-23 20:52:44 +01:00
stickler-ci
222a000d31
Fixing style errors.
2020-02-23 14:27:22 +00:00
ATM john
8a279ed124
improve extrafields display in notes
2020-02-23 15:24:59 +01:00
ATM john
679e2fd186
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 11:36:06 +01:00
ATM john
fe4e00b139
Add new params to extrafields forms to allow extrafields to be displayed on pdf documents
2020-02-23 11:32:38 +01:00
stickler-ci
d575188d80
Fixing style errors.
2020-02-23 09:11:58 +00:00
ATM john
ff6dc735ee
fix extrafield conf cache
2020-02-23 10:09:47 +01:00
stickler-ci
281e059487
Fixing style errors.
2020-02-23 01:28:30 +00:00
ATM john
8c36dd0ad8
add extrafields in notes
2020-02-23 02:26:21 +01:00
ATM john
60b3d9d4db
Add extrafields on PDF object lines for compatible pdf
2020-02-22 18:07:15 +01:00
stickler-ci
2b027cfebf
Fixing style errors.
2020-02-22 15:45:39 +00:00
ATM john
e209fd2973
Add extrafields on PDF object lines
2020-02-22 16:27:44 +01:00
ATM john
aa77d96f23
remove IDE warnings
2020-02-22 12:06:21 +01:00
javierybar
fddcc844ff
Add orders to Receipt Printers module
2020-02-22 11:30:48 +01:00
ATM john
4117aa56a2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-22 11:19:49 +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
55bef402c4
Fix remove a lot of warnings on Eclipse
2020-02-21 17:47:36 +01:00
Laurent Destailleur
ec09e7222d
Fix remove a lot of warnings on Eclipse
2020-02-21 17:31:37 +01:00
Laurent Destailleur
7e4af04886
CSS For bookmark dropdown
2020-02-21 17:18:01 +01:00
Laurent Destailleur
be3ecb3093
Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless
2020-02-21 14:32:53 +01:00
Laurent Destailleur
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
andreubisquerra
e316061a9a
Fix travis
2020-02-20 16:26:30 +01:00
andreubisquerra
7a241ba042
Fix travis
2020-02-20 15:47:40 +01:00
Laurent Destailleur
c29e1e78f3
NEW Bookmarks are now in top menu bar
2020-02-20 15:43:31 +01:00
Laurent Destailleur
593091f399
FIX etrafield with visibilty=5 were not in read only
...
FIX CSS
FIX option for topbar search and bookmarks
Conflicts:
htdocs/theme/eldy/global.inc.php
2020-02-20 15:29:59 +01:00
Laurent Destailleur
a3fce650d9
FIX etrafield with visibilty=5 were not in read only
...
FIX CSS
FIX option for topbar search and bookmarks
2020-02-20 15:25:32 +01:00
javierybar
2942e85e47
More elegant and easy to understand printer setup
2020-02-20 15:16:17 +01:00
Ferran Marcet
9ff424e23b
FIX: Visualization rights correction on last modified contacts box
2020-02-20 11:45:46 +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
ac5e9ce5b3
Fix doc
2020-02-20 01:34:33 +01:00
Laurent Destailleur
76f0df138b
Try to fix doc
2020-02-20 01:26:40 +01:00
Laurent Destailleur
5c48f6f405
Lang of web site is optional
2020-02-20 01:08:53 +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
2cfca2a45e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/index.php
htdocs/core/boxes/box_fournisseurs.php
htdocs/core/boxes/box_propales.php
htdocs/societe/index.php
2020-02-20 00:18:58 +01:00
Laurent Destailleur
91899d2f56
Fix list of opportunity with filter on search_usage_opportunity
2020-02-19 14:32:12 +01:00
Laurent Destailleur
ace0c7f89d
Fix list of opportunity with filter on search_usage_opportunity
2020-02-19 14:31:32 +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
f109864670
NEW Add a profil to import contact categories
...
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
John Botella
729048a113
Fix langs
2020-02-19 12:33:36 +01:00
John Botella
d65c17df7d
Add retained warranty for all invoice for crabe PDF
2020-02-19 12:30:52 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +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
016c7ad875
FIX #13135
2020-02-19 01:17:16 +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
ce3e977fc3
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-02-18 23:49:10 +01:00
Laurent Destailleur
88b104bc2f
Merge pull request #13121 from aspangaro/12.0_a14
...
NEW: Donation - Update FR CERFA to 11580*04
2020-02-18 23:48:08 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
dacf896f80
FIX Can read salary if permission + user under hierarchy
2020-02-18 23:44:36 +01:00
Laurent Destailleur
ce09ec8805
Fix phpcs
2020-02-18 23:35:45 +01:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
24bb61b5e4
FIX Usage of project not available in export.
2020-02-18 12:51:53 +01:00
Laurent Destailleur
b6be42e103
FIX List of viewed projects too large in task widget
2020-02-18 12:40:50 +01:00
Laurent Destailleur
67eb584a7f
FIX Missing field "billed" in export
2020-02-18 12:22:25 +01:00
Laurent Destailleur
7e814e2a08
FIX Menu truncated. Add tooltip to have all content.
2020-02-18 12:01:19 +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
Pierre Ardoin
f8e18a3826
Fix Not displayed email
2020-02-17 19:25:25 +01:00
Pierre Ardoin
a773b86ad1
Fix not displayed value
2020-02-17 19:23:48 +01:00
Pierre Ardoin
29cfd6d857
Fix issue with Multicompany
...
Before : can't find photo
Now : ok
2020-02-17 19:18:22 +01:00
Pierre Ardoin
f1bbe1c64d
Fix issue not show photo.
2020-02-17 19:09:58 +01:00
Laurent Destailleur
299219891e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-17 12:41:45 +01:00
Laurent Destailleur
25fa83bd06
Fix phpcs
2020-02-17 12:40:26 +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
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7
Fix prefix of log
2020-02-17 12:22:52 +01:00
Laurent Destailleur
a02f5cde92
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
Laurent Destailleur
bf281b7dab
Comment
2020-02-17 11:51:49 +01:00
Alexandre SPANGARO
aa9d00c62e
FIX
2020-02-17 07:47:08 +01:00
Alexandre SPANGARO
76a369d351
NEW: Donation - Update FR CERFA to 11580*04
2020-02-17 07:43:24 +01:00
Laurent Destailleur
4b5cda5cd2
Code comment on OAUth ahtent
2020-02-16 21:16:00 +01:00
Laurent Destailleur
20797920d7
Fix phpcs
2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
52aebce789
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-16 18:16:05 +01:00
Laurent Destailleur
ac7a077c77
FIX Vulnerability in module from modulebuilder. Only fields with type
...
html can contains HTML.
2020-02-16 18:14:10 +01:00
Laurent Destailleur
dc3a15945d
Add method getKanbanView()
2020-02-16 12:05:00 +01:00
Laurent Destailleur
6c9fb06292
Perf
2020-02-15 10:56:44 +01:00
Regis Houssin
0ab0bb2e7d
FIX wrong test
2020-02-14 19:26:28 +01:00
Laurent Destailleur
fc018d0063
Module MO is now stable
2020-02-13 17:24:29 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
46bccf88d3
Fix var not initialized
2020-02-13 12:33:34 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31
FIX #13100
2020-02-13 11:26:11 +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
4762bafb02
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/mrp/class/mo.class.php
2020-02-12 22:58:37 +01:00
Laurent Destailleur
2ce0aa87e6
Responsive
2020-02-12 22:10:26 +01:00
Laurent Destailleur
bf2051ff80
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 22:03:01 +01:00
Laurent Destailleur
4981da235c
Fix phpcs
2020-02-12 22:00:44 +01:00
Laurent Destailleur
e69b362fb5
Merge pull request #13079 from RubenRuCh/11.0
...
FIX : #13038 ExpenseReport PDF - custom category description is not correct
2020-02-12 21:59:23 +01:00
stickler-ci
f8eaca24af
Fixing style errors.
2020-02-12 20:54:56 +00:00
Laurent Destailleur
c31fcb3981
Merge branch 'develop' into patch-30
2020-02-12 21:53:02 +01:00
Laurent Destailleur
75774ec6c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 20:30:30 +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
4a5467234d
Merge pull request #13074 from simicar29/simicar29-patch-4
...
Show extrafields only when enabled
2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a
Merge pull request #13081 from bb2a/patch-14
...
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
2020-02-12 18:46:08 +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
cc6313cdf3
Fix import examples
2020-02-11 19:32:27 +01:00
Laurent Destailleur
2afe86a1d6
Fix look and feel v11
2020-02-11 19:19:13 +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
8518e0752f
NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
2020-02-11 16:01:32 +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
Anthony Berton
6b6355f373
Update html.form.class.php
2020-02-11 09:57:52 +01:00
Ruger
8d9de521f3
FIX : #13038 ExpenseReport PDF - custom category description is not correct
2020-02-11 09:13:15 +01:00
Regis Houssin
275b5d1f77
FIX #10309
2020-02-11 07:32:29 +01:00
Laurent Destailleur
5823e2f5ef
add warning
2020-02-10 20:57:55 +01:00
Pierre Ardoin
fab8536f05
add project ref and title
2020-02-10 17:02:10 +01:00
Pierre Ardoin
f9b03596f6
Add project ref and title
2020-02-10 17:01:21 +01:00
Pierre Ardoin
573d86c725
Add project's ref and Title
2020-02-10 16:57:59 +01:00
Pierre Ardoin
546e7b1bcf
Add project Ref and Title
2020-02-10 16:57:02 +01:00
Pierre Ardoin
f279b4138b
Add Project Ref and Title
2020-02-10 16:52:41 +01:00
Laurent Destailleur
82f5482e25
Merge pull request #13071 from aspangaro/12.0_a13
...
NEW: Add accountancy code of thirdparty in supplier export
2020-02-10 15:40:09 +01:00
Laurent Destailleur
4973f49113
Merge pull request #13070 from aspangaro/12.0_a12
...
NEW: Add accountancy code of thirdparty in contact export
2020-02-10 15:38:45 +01:00
Laurent Destailleur
8604ff99ed
Merge pull request #13068 from andreubisquerra/develop
...
Add time tags to Receipt Printers module
2020-02-10 15:37:37 +01:00
simicar29
8bce409db0
Show extrafields only when enabled
...
Show extrafields only in context where they are enabled (especially in edit mode that uses the showOptionals function).
2020-02-10 13:14:42 +01:00
Pierre Ardoin
6de3795648
change translation Ref
...
ProjectRef -> RefProject
2020-02-10 09:10:45 +01:00
Pierre Ardoin
d74e1d9182
Update pdf_crabe.modules.php
2020-02-10 09:07:26 +01:00
stickler-ci
5022e58b95
Fixing style errors.
2020-02-10 08:04:40 +00:00
Pierre Ardoin
bd00803090
Update pdf_crabe.modules.php
2020-02-10 09:03:00 +01:00
stickler-ci
6ffbab0a63
Fixing style errors.
2020-02-10 08:01:40 +00:00
Pierre Ardoin
815206cb15
Add Project Title in header of pdf
...
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
2020-02-10 08:59:22 +01:00
Alexandre SPANGARO
20f9154cf3
NEW: Add accountancy code of thirdparty in supplier export
2020-02-10 06:24:13 +01:00
Alexandre SPANGARO
d28f110100
NEW: Add accountancy code of thirdparty in contact export
2020-02-10 06:06:27 +01:00
Laurent Destailleur
ecb1f1f2d7
Responsive
2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb
Responsive
2020-02-10 00:47:44 +01:00
Laurent Destailleur
d49943ab37
FIX #13019
2020-02-09 18:38:27 +01:00
Laurent Destailleur
94d6fa06dc
FIX #13022
2020-02-09 18:34:53 +01:00
Laurent Destailleur
8645fd8946
FIX CVE-2019–17223 FIX #13053
2020-02-09 18:28:57 +01:00
Laurent Destailleur
6badf724cf
FIX Mail smtps truncated if content has a line with single .
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-09 16:38:19 +01:00
Laurent Destailleur
5c000159c1
FIX Mail smtps truncated if content has a line with single .
2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f
FIX Mail smtps truncated if content has a line with single .
2020-02-09 15:51:43 +01:00
andreubisquerra
37e815183e
Add time tags
2020-02-09 14:06:02 +01:00
Laurent Destailleur
1ee959a11f
Generic graph
2020-02-08 17:46:41 +01:00
Laurent Destailleur
33addfab01
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-08 17:21:17 +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
81df5cd9ab
Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering
...
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
2020-02-08 17:16:01 +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
665876ffa4
Merge pull request #13061 from andreubisquerra/develop
...
Add and finish receipt printer tags
2020-02-08 16:19:44 +01:00
pnueda
c083458adf
Update html.formfile.class.php
...
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1
Merge pull request #13060 from pnueda/patch-1
...
Update html.formfile.class.php
2020-02-08 16:18:17 +01:00
Laurent Destailleur
ee29c3efdd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-08 16:02:23 +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
c27260869b
FIX #13046 More complete
2020-02-08 15:59:08 +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
b01e1e7724
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160
Fix #13046 - Bad parenthesis on test
2020-02-08 15:28:40 +01:00
Laurent Destailleur
5fac824824
Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing
...
FIX advanced target emailing sql and ergonomy
2020-02-08 14:59:00 +01:00